1 |
commit: f6715ca3cbae4a86fa3d1bf06b8715ab9993b62d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 9 20:56:41 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 11 11:57:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6715ca3 |
7 |
|
8 |
gnome-extra/gnome-color-manager: Fix build with exiv2-0.27 |
9 |
|
10 |
Using exiv2.hpp instead of individual includes is exiv2 recommendation for some |
11 |
time already while the headers are subject to refactoring. |
12 |
|
13 |
Standard fix as seen in other affected packages. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/674086 |
16 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
.../gnome-color-manager-3.24.0-exiv2-0.27.patch | 41 ++++++++++++++++++++++ |
20 |
.../gnome-color-manager-3.24.0.ebuild | 7 +++- |
21 |
.../gnome-color-manager-3.30.0-r1.ebuild | 5 ++- |
22 |
3 files changed, 51 insertions(+), 2 deletions(-) |
23 |
|
24 |
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch |
25 |
new file mode 100644 |
26 |
index 00000000000..00878bc26a8 |
27 |
--- /dev/null |
28 |
+++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch |
29 |
@@ -0,0 +1,41 @@ |
30 |
+Patch kindly borrowed from Mageia. |
31 |
+ |
32 |
+https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 |
33 |
+ |
34 |
+diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp |
35 |
+--- a/src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200 |
36 |
++++ b/src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100 |
37 |
+@@ -19,8 +19,7 @@ |
38 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
39 |
+ */ |
40 |
+ |
41 |
+-#include <exiv2/image.hpp> |
42 |
+-#include <exiv2/exif.hpp> |
43 |
++#include <exiv2/exiv2.hpp> |
44 |
+ #include <iostream> |
45 |
+ #include <iomanip> |
46 |
+ |
47 |
+@@ -51,7 +50,11 @@ |
48 |
+ if (argc == 2) |
49 |
+ filename = argv[1]; |
50 |
+ if (filename.empty()) |
51 |
++#if EXIV2_TEST_VERSION(0,27,0) |
52 |
++ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); |
53 |
++#else |
54 |
+ throw Exiv2::Error(1, "No filename specified"); |
55 |
++#endif |
56 |
+ image = Exiv2::ImageFactory::open(filename); |
57 |
+ image->readMetadata(); |
58 |
+ |
59 |
+@@ -60,7 +63,11 @@ |
60 |
+ if (exifData.empty()) { |
61 |
+ std::string error(argv[1]); |
62 |
+ error += ": No Exif data found in the file"; |
63 |
++#if EXIV2_TEST_VERSION(0,27,0) |
64 |
++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); |
65 |
++#else |
66 |
+ throw Exiv2::Error(1, error); |
67 |
++#endif |
68 |
+ } |
69 |
+ |
70 |
+ /* try to find make, model and serial number */ |
71 |
|
72 |
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild |
73 |
index 441b966300c..3ab3d64df80 100644 |
74 |
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild |
75 |
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild |
76 |
@@ -1,4 +1,4 @@ |
77 |
-# Copyright 1999-2018 Gentoo Foundation |
78 |
+# Copyright 1999-2019 Gentoo Authors |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
|
81 |
EAPI=6 |
82 |
@@ -39,6 +39,11 @@ DEPEND="${RDEPEND} |
83 |
virtual/pkgconfig |
84 |
" |
85 |
|
86 |
+PATCHES=( |
87 |
+ # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 |
88 |
+ "${FILESDIR}"/${P}-exiv2-0.27.patch # bug 674086 |
89 |
+) |
90 |
+ |
91 |
src_configure() { |
92 |
# Always enable tests since they are check_PROGRAMS anyway |
93 |
# appstream does not want to be relax by default ! |
94 |
|
95 |
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild |
96 |
index 5f035f75126..4048b8ef3bf 100644 |
97 |
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild |
98 |
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild |
99 |
@@ -1,4 +1,4 @@ |
100 |
-# Copyright 1999-2018 Gentoo Authors |
101 |
+# Copyright 1999-2019 Gentoo Authors |
102 |
# Distributed under the terms of the GNU General Public License v2 |
103 |
|
104 |
EAPI=6 |
105 |
@@ -42,6 +42,9 @@ DEPEND="${RDEPEND} |
106 |
PATCHES=( |
107 |
# https://bugzilla.gnome.org/show_bug.cgi?id=796428 |
108 |
"${FILESDIR}"/3.28-remove-unwvanted-check.patch |
109 |
+ |
110 |
+ # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 |
111 |
+ "${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086 |
112 |
) |
113 |
|
114 |
src_prepare() { |