[pkgsrc/trunk]: pkgsrc/graphics/gimp-ufraw graphics/gimp-ufraw: Add patch to ...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca46a3e4b536
branches:  trunk
changeset: 400023:ca46a3e4b536
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Aug 20 14:31:03 2019 +0000

description:
graphics/gimp-ufraw: Add patch to cope with newer exiv2

diffstat:

 graphics/gimp-ufraw/Makefile                      |   4 +-
 graphics/gimp-ufraw/distinfo                      |   3 +-
 graphics/gimp-ufraw/patches/patch-ufraw__exiv2.cc |  27 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r b0944e5ee9dd -r ca46a3e4b536 graphics/gimp-ufraw/Makefile
--- a/graphics/gimp-ufraw/Makefile      Tue Aug 20 14:06:57 2019 +0000
+++ b/graphics/gimp-ufraw/Makefile      Tue Aug 20 14:31:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2019/08/11 13:21:11 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2019/08/20 14:31:03 gdt Exp $
 
 # Note that upstream has replaced tarballs without changing the
 # version number (e.g., 0.19.2 had two different tarballs).
@@ -6,7 +6,7 @@
 # updating pkgsrc.
 DISTNAME=              ufraw-0.22
 PKGNAME=               gimp-${DISTNAME}
-PKGREVISION=           13
+PKGREVISION=           14
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
diff -r b0944e5ee9dd -r ca46a3e4b536 graphics/gimp-ufraw/distinfo
--- a/graphics/gimp-ufraw/distinfo      Tue Aug 20 14:06:57 2019 +0000
+++ b/graphics/gimp-ufraw/distinfo      Tue Aug 20 14:31:03 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.34 2015/11/03 21:34:00 agc Exp $
+$NetBSD: distinfo,v 1.35 2019/08/20 14:31:03 gdt Exp $
 
 SHA1 (ufraw-0.22.tar.gz) = 7fc33b66f4d6ecc277e1a5589c8e5db24568949c
 RMD160 (ufraw-0.22.tar.gz) = 2588acde88dda8c30310b967e7185862072c124c
 SHA512 (ufraw-0.22.tar.gz) = a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
 Size (ufraw-0.22.tar.gz) = 1103554 bytes
+SHA1 (patch-ufraw__exiv2.cc) = c6f3c6bd9ec8cdc3dee1801f9b1972bbe827cd8d
diff -r b0944e5ee9dd -r ca46a3e4b536 graphics/gimp-ufraw/patches/patch-ufraw__exiv2.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gimp-ufraw/patches/patch-ufraw__exiv2.cc Tue Aug 20 14:31:03 2019 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ufraw__exiv2.cc,v 1.1 2019/08/20 14:31:03 gdt Exp $
+
+Adjust to newer exiv2.
+
+Not yet sent upstream.
+
+--- ufraw_exiv2.cc.orig        2015-06-16 03:58:38.000000000 +0000
++++ ufraw_exiv2.cc
+@@ -17,7 +17,9 @@
+ #ifdef HAVE_EXIV2
+ #include <exiv2/image.hpp>
+ #include <exiv2/easyaccess.hpp>
++#include <exiv2/error.hpp>
+ #include <exiv2/exif.hpp>
++#include <iostream>
+ #include <sstream>
+ #include <cassert>
+ 
+@@ -67,7 +69,7 @@ extern "C" int ufraw_exif_read_input(ufr
+         if (exifData.empty()) {
+             std::string error(uf->filename);
+             error += ": No Exif data found in the file";
+-            throw Exiv2::Error(1, error);
++            throw Exiv2::Error(Exiv2::kerGeneralError, error);
+         }
+ 
+         /* List of tag names taken from exiv2's printSummary() in actions.cpp */