Skip to content

Commit

Permalink
media-gfx/digikam: do not allow media-libs/opencv[qt5]
Browse files Browse the repository at this point in the history
The presence of qt5 symbols in opencv collides with the symbols used in
digikam:4 causing a crash.

Gentoo-bug: 595358

Package-Manager: portage-2.3.2
  • Loading branch information
kensington committed Oct 20, 2016
1 parent 44be616 commit c635fbe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion media-gfx/digikam/digikam-4.14.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CDEPEND="
media-libs/liblqr
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=
media-libs/opencv:=[contrib(+)]
media-libs/opencv:=[contrib(+),-qt5]
media-libs/phonon[qt4]
>=media-libs/tiff-3.8.2:0
virtual/jpeg:0
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/digikam/digikam-4.4.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CDEPEND="
media-libs/liblqr
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=
>=media-libs/opencv-2.4.9
>=media-libs/opencv-2.4.9[-qt5]
media-libs/tiff
virtual/jpeg
dev-qt/qtgui:4
Expand Down

0 comments on commit c635fbe

Please sign in to comment.