summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-10-15 22:29:39 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-10-15 22:46:18 +0200
commit3621c5441adf6c1bf587c759d3d621b289f4901b (patch)
treeb0c65818f94005e1ad3a5b138c17522179f3a1b5 /media-gfx/krita
parentx11-misc/rofi: Version bump. (diff)
downloadgentoo-3621c5441adf6c1bf587c759d3d621b289f4901b.tar.gz
gentoo-3621c5441adf6c1bf587c759d3d621b289f4901b.tar.bz2
gentoo-3621c5441adf6c1bf587c759d3d621b289f4901b.zip
media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'media-gfx/krita')
-rw-r--r--media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch11
-rw-r--r--media-gfx/krita/krita-3.2.1.ebuild7
2 files changed, 16 insertions, 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
new file mode 100644
index 000000000000..22c3858f4c66
--- /dev/null
+++ 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
index 7c6ab717abaa..12b520bc5c56 100644
--- 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=(