| 1 |
commit: 7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 18 00:32:58 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 18 00:32:58 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdde17f |
| 7 |
|
| 8 |
media-gfx/krita: Drop workaround for media-gfx/exiv2-0.27 |
| 9 |
|
| 10 |
This reverts commit 3621c5441adf6c1bf587c759d3d621b289f4901b. |
| 11 |
|
| 12 |
media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 ----------- |
| 13 |
media-gfx/krita/krita-3.2.1.ebuild | 7 ++----- |
| 14 |
2 files changed, 2 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 22c3858f4c6..00000000000 |
| 19 |
--- a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,11 +0,0 @@ |
| 22 |
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200 |
| 23 |
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200 |
| 24 |
-@@ -17,7 +17,7 @@ |
| 25 |
- #include "kis_xmp_io.h" |
| 26 |
- |
| 27 |
- #include <string> |
| 28 |
--#include <exiv2/xmp.hpp> |
| 29 |
-+#include <exiv2/xmp_exiv2.hpp> |
| 30 |
- |
| 31 |
- #include "kis_exiv2.h" |
| 32 |
- |
| 33 |
|
| 34 |
diff --git a/media-gfx/krita/krita-3.2.1.ebuild b/media-gfx/krita/krita-3.2.1.ebuild |
| 35 |
index 12b520bc5c5..7c6ab717aba 100644 |
| 36 |
--- a/media-gfx/krita/krita-3.2.1.ebuild |
| 37 |
+++ b/media-gfx/krita/krita-3.2.1.ebuild |
| 38 |
@@ -40,7 +40,7 @@ COMMON_DEPEND=" |
| 39 |
$(add_qt_dep qtx11extras) |
| 40 |
$(add_qt_dep qtxml) |
| 41 |
dev-libs/boost:= |
| 42 |
- >=media-gfx/exiv2-0.26_p20170713:= |
| 43 |
+ media-gfx/exiv2:= |
| 44 |
media-libs/lcms |
| 45 |
media-libs/libpng:0= |
| 46 |
sys-libs/zlib |
| 47 |
@@ -72,10 +72,7 @@ RDEPEND="${COMMON_DEPEND} |
| 48 |
!app-office/calligra-l10n:4[calligra_features_krita(+)] |
| 49 |
" |
| 50 |
|
| 51 |
-PATCHES=( |
| 52 |
- "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch |
| 53 |
- "${FILESDIR}"/${P}-exiv2-0.26.1.patch |
| 54 |
-) |
| 55 |
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch ) |
| 56 |
|
| 57 |
src_configure() { |
| 58 |
local mycmakeargs=( |
Archives