summaryrefslogtreecommitdiff
path: root/media-gfx/gthumb/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
commitc8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-gfx/gthumb/files
parent2891d29af8907ce881662f4a02844926d7a293c7 (diff)
gentoo resync : 12.01.2019
Diffstat (limited to 'media-gfx/gthumb/files')
-rw-r--r--media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch31
1 files changed, 31 insertions, 0 deletions
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 000000000000..2bd8b94c3c11
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
@@ -0,0 +1,31 @@
+Patch kindly borrowed from Mageia.
+
+* asturm@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) {