commit: a430106ef87cdbffc6cefbc1ac1a8e5bb3ea6242 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 9 21:07:52 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 11 11:57:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a430106e
media-gfx/gthumb: Fix build with exiv2-0.27 Using exiv2.hpp instead of individual includes is exiv2 recommendation for some time already while the headers are subject to refactoring. Standard fix as seen in other affected packages. Closes: https://bugs.gentoo.org/674092 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../gthumb/files/gthumb-3.6.2-exiv2-0.27.patch | 31 ++++++++++++++++++++++ media-gfx/gthumb/gthumb-3.6.2.ebuild | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch new file mode 100644 index 00000000000..2bd8b94c3c1 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch @@ -0,0 +1,31 @@ +Patch kindly borrowed from Mageia. + +* ast...@gentoo.org: Dropped unnecessary and backwards incompatible +xmp_exiv2.hpp include. + +https://gitlab.gnome.org/GNOME/gthumb/issues/30 + +diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp +--- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200 ++++ b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100 +@@ -32,7 +32,7 @@ + #include <sstream> + #include <vector> + #include <iomanip> +-#include <exiv2/xmp.hpp> ++#include <exiv2/exiv2.hpp> + #include <gthumb.h> + #include "exiv2-utils.h" + +@@ -1073,7 +1073,11 @@ + + try { + if (exifData.empty()) { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file"); ++#else + throw Exiv2::Error(1, " No Exif data found in the file"); ++#endif + } + Exiv2::ExifData::const_iterator end = exifData.end(); + for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild index 1eab1eda6c7..fa3de15b5f1 100644 --- a/media-gfx/gthumb/gthumb-3.6.2.ebuild +++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} # eautoreconf needs: # gnome-base/gnome-common +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092 + src_prepare() { # Remove unwanted CFLAGS added with USE=debug sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
