| 1 |
commit: 47eba01d3895bd74c7fffc56025c32827c817af2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 21:54:38 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 22:02:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47eba01d |
| 7 |
|
| 8 |
media-gfx/ufraw: 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 |
media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 25 +++++++++++++++++++++++ |
| 14 |
media-gfx/ufraw/ufraw-0.22-r2.ebuild | 3 ++- |
| 15 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..b5b4140fff8 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch |
| 22 |
@@ -0,0 +1,25 @@ |
| 23 |
+--- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200 |
| 24 |
++++ b/ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100 |
| 25 |
+@@ -15,9 +15,7 @@ |
| 26 |
+ #include "ufraw.h" |
| 27 |
+ |
| 28 |
+ #ifdef HAVE_EXIV2 |
| 29 |
+-#include <exiv2/image.hpp> |
| 30 |
+-#include <exiv2/easyaccess.hpp> |
| 31 |
+-#include <exiv2/exif.hpp> |
| 32 |
++#include <exiv2/exiv2.hpp> |
| 33 |
+ #include <sstream> |
| 34 |
+ #include <cassert> |
| 35 |
+ |
| 36 |
+@@ -67,7 +65,11 @@ |
| 37 |
+ if (exifData.empty()) { |
| 38 |
+ std::string error(uf->filename); |
| 39 |
+ error += ": No Exif data found in the file"; |
| 40 |
++#if EXIV2_TEST_VERSION(0,27,0) |
| 41 |
++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); |
| 42 |
++#else |
| 43 |
+ throw Exiv2::Error(1, error); |
| 44 |
++#endif |
| 45 |
+ } |
| 46 |
+ |
| 47 |
+ /* List of tag names taken from exiv2's printSummary() in actions.cpp */ |
| 48 |
|
| 49 |
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild |
| 50 |
index 53994be42a8..9bbc7e77121 100644 |
| 51 |
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild |
| 52 |
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2018 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -44,6 +44,7 @@ PATCHES=( |
| 60 |
"${FILESDIR}"/${P}-drop_superfluous_abs.patch |
| 61 |
"${FILESDIR}"/${P}-fix-unsigned-char.patch |
| 62 |
"${FILESDIR}"/${P}-jpeg9.patch |
| 63 |
+ "${FILESDIR}"/${P}-exiv2-0.27.patch |
| 64 |
) |
| 65 |
|
| 66 |
src_prepare() { |
Archives