Deal with exiv2 interface changes.

4 files changed, 50 insertions, 2 deletions

diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index e38380892f9..1a944b2f3e9 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.31 2019/12/21 23:43:26 joerg Exp $
 
 SHA1 (gthumb-2.14.4.tar.xz) = ed7fb3649303527b3704b8d28ea9d49e2e65f7ef
 RMD160 (gthumb-2.14.4.tar.xz) = 384b4441ed3d4022b6e5c5301b5a3c422f8b101b
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 2ce0608493b3a261a0c0b5a67932173081837522
 SHA1 (patch-af) = 55ce1101c8e06f6341934c474772d3bac7680046
 SHA1 (patch-ag) = cb1fe9401d9ea3a89ce797465c548b01f99db129
 SHA1 (patch-ah) = d6ebd939dda6459a1dd20b4e7921ada2c9f6fdd2
+SHA1 (patch-extensions_exiv2__tools_exiv2-utils.cpp) = cf67e3993ba51b2a6e3f9627f1b4d8cdcfe06621
diff --git a/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp b/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp
new file mode 100644
index 00000000000..914e05b80d3
--- /dev/null
+++ b/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-extensions_exiv2__tools_exiv2-utils.cpp,v 1.1 2019/12/21 23:43:26 joerg Exp $
+
+--- extensions/exiv2_tools/exiv2-utils.cpp.orig	2019-12-21 22:44:56.297630474 +0000
++++ extensions/exiv2_tools/exiv2-utils.cpp
+@@ -33,7 +33,8 @@
+ #include <sstream>
+ #include <vector>
+ #include <iomanip>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/xmp_exiv2.hpp>
++#include <exiv2/version.hpp>
+ #include <gthumb.h>
+ #include "exiv2-utils.h"
+ 
+@@ -898,7 +899,7 @@ dump_exif_data (Exiv2::ExifData &exifDat
+ 
+ 	try {
+ 		if (exifData.empty()) {
+-			throw Exiv2::Error(1, " No Exif data found in the file");
++			throw Exiv2::Error(Exiv2::kerGeneralError, " No Exif data found in the file");
+ 		}
+ 		Exiv2::ExifData::const_iterator end = exifData.end();
+ 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
diff --git a/graphics/gthumb3/distinfo b/graphics/gthumb3/distinfo
index 51c3d0c9e69..309dc1d8483 100644
--- a/graphics/gthumb3/distinfo
+++ b/graphics/gthumb3/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/12/21 23:43:27 joerg Exp $
 
 SHA1 (gthumb-3.0.2.tar.xz) = 39fa6da3ad7a336f376b07be4b4028a56014e598
 RMD160 (gthumb-3.0.2.tar.xz) = b5af2221d5c274eb2083e7bac070f5239da900d9
 SHA512 (gthumb-3.0.2.tar.xz) = 00a9ebfcedb8905ed2c05132eed70644ddfe239da9055d377652fd8f9e4fd84e1ffb1f7e33d3fb46b166e31120c128f09f17edd6c02000f96cc9958623c21c43
 Size (gthumb-3.0.2.tar.xz) = 5803480 bytes
 SHA1 (patch-ah) = b0c2b36911457b3ca3b60b2892abbb73b96fb72e
+SHA1 (patch-extensions_exiv2__tools_exiv2-utils.cpp) = 5214845ffc3f6d10539a2a1f44745ea0059e75f8
diff --git a/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp b/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp
new file mode 100644
index 00000000000..0ca57ecd981
--- /dev/null
+++ b/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-extensions_exiv2__tools_exiv2-utils.cpp,v 1.1 2019/12/21 23:43:27 joerg Exp $
+
+--- extensions/exiv2_tools/exiv2-utils.cpp.orig	2019-12-21 23:03:22.584354769 +0000
++++ extensions/exiv2_tools/exiv2-utils.cpp
+@@ -33,7 +33,8 @@
+ #include <sstream>
+ #include <vector>
+ #include <iomanip>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/xmp_exiv2.hpp>
++#include <exiv2/version.hpp>
+ #include <gthumb.h>
+ #include "exiv2-utils.h"
+ 
+@@ -928,7 +929,7 @@ dump_exif_data (Exiv2::ExifData &exifDat
+ 
+ 	try {
+ 		if (exifData.empty()) {
+-			throw Exiv2::Error(1, " No Exif data found in the file");
++			throw Exiv2::Error(Exiv2::kerGeneralError, " No Exif data found in the file");
+ 		}
+ 		Exiv2::ExifData::const_iterator end = exifData.end();
+ 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {