media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013

Package-Manager: Portage-2.3.11, Repoman-2.3.3
johu · Oct 15, 2017 · 3621c54 · 3621c54
1 parent 997da50
commit 3621c54
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
@@ -0,0 +1,11 @@
+--- a/libs/ui/kisexiv2/kis_xmp_io.cpp	2017-10-15 22:09:56.908903726 +0200
++++ b/libs/ui/kisexiv2/kis_xmp_io.cpp	2017-10-15 22:10:23.956192118 +0200
+@@ -17,7 +17,7 @@
+ #include "kis_xmp_io.h"
+
+ #include <string>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/xmp_exiv2.hpp>
+
+ #include "kis_exiv2.h"
+
diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
 	dev-libs/boost:=
-	media-gfx/exiv2:=
+	>=media-gfx/exiv2-0.26_p20170713:=
 	media-libs/lcms
 	media-libs/libpng:0=
 	sys-libs/zlib
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
+	"${FILESDIR}"/${P}-exiv2-0.26.1.patch
+)
 
 src_configure() {
 	local mycmakeargs=(