summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-10-21 08:22:56 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-10-21 08:23:03 +1100
commitc635fbeb64aa8a2e85641dda54cfcea8d7b162b7 (patch)
tree773cf066a73c73b30b8b17672c16558b48724558 /media-gfx/digikam
parentmedia-libs/opencv: x86 stable (diff)
downloadgentoo-c635fbeb64aa8a2e85641dda54cfcea8d7b162b7.tar.gz
gentoo-c635fbeb64aa8a2e85641dda54cfcea8d7b162b7.tar.bz2
gentoo-c635fbeb64aa8a2e85641dda54cfcea8d7b162b7.zip
media-gfx/digikam: do not allow media-libs/opencv[qt5]
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
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r--media-gfx/digikam/digikam-4.14.0-r1.ebuild2
-rw-r--r--media-gfx/digikam/digikam-4.4.0-r1.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild
index f3828f62f31..3f81aead6b3 100644
--- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.14.0-r1.ebuild
@@ -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
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index ce6f022f959..d8b0287b0ff 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -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