| 1 |
commit: 4329dfc748a9f4a27af7fc8833592d7acbc0f85a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 31 17:30:04 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 31 21:13:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4329dfc7 |
| 7 |
|
| 8 |
media-gfx/kphotoalbum: Fix build with exiv2-0.27 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/kphotoalbum-5.4-exiv2-0.27.patch | 61 ++++++++++++++++++++++ |
| 14 |
media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 + |
| 15 |
2 files changed, 63 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..7b7f612b94f |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch |
| 22 |
@@ -0,0 +1,61 @@ |
| 23 |
+From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Johannes Zarl-Zierl <johannes@××××××××××.at> |
| 25 |
+Date: Sun, 30 Dec 2018 23:36:24 +0100 |
| 26 |
+Subject: Use Exiv2 0.27 if available. |
| 27 |
+ |
| 28 |
+Beginning with version 0.27, Exiv2 ships with cmake package config |
| 29 |
+files. |
| 30 |
+--- |
| 31 |
+ CMakeLists.txt | 12 +++++++++++- |
| 32 |
+ 1 file changed, 11 insertions(+), 1 deletion(-) |
| 33 |
+ |
| 34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
+index 3012f7a..5dcc29c 100644 |
| 36 |
+--- a/CMakeLists.txt |
| 37 |
++++ b/CMakeLists.txt |
| 38 |
+@@ -44,7 +44,17 @@ if(JPEG_FOUND) |
| 39 |
+ include_directories(${JPEG_INCLUDE_DIR}) |
| 40 |
+ endif() |
| 41 |
+ |
| 42 |
+-find_package(Exiv2 REQUIRED) |
| 43 |
++### 2018-12-30 jzarl |
| 44 |
++# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed |
| 45 |
++# and only find_package(exiv2) should be used |
| 46 |
++find_package(exiv2 CONFIG QUIET) |
| 47 |
++if(exiv2_FOUND) |
| 48 |
++ # search againg with REQUIRED, so that the feature summary correctly shows exiv as required dependency |
| 49 |
++ find_package(exiv2 CONFIG REQUIRED) |
| 50 |
++ set(EXIV2_LIBRARIES exiv2lib) |
| 51 |
++else() |
| 52 |
++ find_package(Exiv2 REQUIRED) |
| 53 |
++endif() |
| 54 |
+ |
| 55 |
+ find_package(KF5Kipi 5.1.0) |
| 56 |
+ set_package_properties(KF5Kipi |
| 57 |
+-- |
| 58 |
+cgit v1.1 |
| 59 |
+From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001 |
| 60 |
+From: Johannes Zarl-Zierl <johannes@××××××××××.at> |
| 61 |
+Date: Sun, 30 Dec 2018 23:43:14 +0100 |
| 62 |
+Subject: Fix compilation with exiv2 0.27 |
| 63 |
+ |
| 64 |
+--- |
| 65 |
+ Exif/Info.cpp | 3 ++- |
| 66 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 67 |
+ |
| 68 |
+diff --git a/Exif/Info.cpp b/Exif/Info.cpp |
| 69 |
+index be4c88f..9545360 100644 |
| 70 |
+--- a/Exif/Info.cpp |
| 71 |
++++ b/Exif/Info.cpp |
| 72 |
+@@ -28,7 +28,8 @@ |
| 73 |
+ #include <QFile> |
| 74 |
+ |
| 75 |
+ #include <exiv2/image.hpp> |
| 76 |
+-#include <exiv2/exif.hpp> |
| 77 |
++#include <exiv2/exv_conf.h> |
| 78 |
++#include <exiv2/version.hpp> |
| 79 |
+ |
| 80 |
+ using namespace Exif; |
| 81 |
+ |
| 82 |
+-- |
| 83 |
+cgit v1.1 |
| 84 |
|
| 85 |
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild |
| 86 |
index ce7c3284e2a..6aaff0db914 100644 |
| 87 |
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild |
| 88 |
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild |
| 89 |
@@ -49,6 +49,8 @@ RDEPEND="${DEPEND} |
| 90 |
|
| 91 |
DOCS=( ChangeLog README ) |
| 92 |
|
| 93 |
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) |
| 94 |
+ |
| 95 |
src_configure() { |
| 96 |
local mycmakeargs=( |
| 97 |
$(cmake-utils_use_find_package kipi KF5Kipi) |
Archives