Received: by mail.netbsd.org (Postfix, from userid 605) id 929E884E32; Sat, 21 Dec 2019 23:43:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1AF6B84D55 for ; Sat, 21 Dec 2019 23:43:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ifWrRc8QOvxB for ; Sat, 21 Dec 2019 23:43:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 59DDE84C2B for ; Sat, 21 Dec 2019 23:43:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 511FDFA97; Sat, 21 Dec 2019 23:43:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576971807145540" MIME-Version: 1.0 Date: Sat, 21 Dec 2019 23:43:27 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20191221234327.511FDFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1576971807145540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat Dec 21 23:43:27 UTC 2019 Modified Files: pkgsrc/graphics/gthumb: distinfo pkgsrc/graphics/gthumb3: distinfo Added Files: pkgsrc/graphics/gthumb/patches: patch-extensions_exiv2__tools_exiv2-utils.cpp pkgsrc/graphics/gthumb3/patches: patch-extensions_exiv2__tools_exiv2-utils.cpp Log Message: Deal with exiv2 interface changes. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/gthumb/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gthumb3/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1576971807145540 Content-Disposition: inline Content-Length: 4160 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gthumb/distinfo diff -u pkgsrc/graphics/gthumb/distinfo:1.30 pkgsrc/graphics/gthumb/distinfo:1.31 --- pkgsrc/graphics/gthumb/distinfo:1.30 Tue Nov 3 21:34:02 2015 +++ pkgsrc/graphics/gthumb/distinfo Sat Dec 21 23:43:26 2019 @@ -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) = 2ce0608493b3a261a0c0b5 SHA1 (patch-af) = 55ce1101c8e06f6341934c474772d3bac7680046 SHA1 (patch-ag) = cb1fe9401d9ea3a89ce797465c548b01f99db129 SHA1 (patch-ah) = d6ebd939dda6459a1dd20b4e7921ada2c9f6fdd2 +SHA1 (patch-extensions_exiv2__tools_exiv2-utils.cpp) = cf67e3993ba51b2a6e3f9627f1b4d8cdcfe06621 Index: pkgsrc/graphics/gthumb3/distinfo diff -u pkgsrc/graphics/gthumb3/distinfo:1.2 pkgsrc/graphics/gthumb3/distinfo:1.3 --- pkgsrc/graphics/gthumb3/distinfo:1.2 Tue Nov 3 21:34:02 2015 +++ pkgsrc/graphics/gthumb3/distinfo Sat Dec 21 23:43:27 2019 @@ -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 Added files: Index: pkgsrc/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp diff -u /dev/null pkgsrc/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp:1.1 --- /dev/null Sat Dec 21 23:43:27 2019 +++ pkgsrc/graphics/gthumb/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp Sat Dec 21 23:43:26 2019 @@ -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 + #include + #include +-#include ++#include ++#include + #include + #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) { Index: pkgsrc/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp diff -u /dev/null pkgsrc/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp:1.1 --- /dev/null Sat Dec 21 23:43:27 2019 +++ pkgsrc/graphics/gthumb3/patches/patch-extensions_exiv2__tools_exiv2-utils.cpp Sat Dec 21 23:43:27 2019 @@ -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 + #include + #include +-#include ++#include ++#include + #include + #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) { --_----------=_1576971807145540--