From 2d36cee9cd2b04d3b992ea193599556a6ad9ca17 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Fri, 8 Mar 2019 21:29:25 +0000 Subject: [PATCH] graphics/ufraw: prepare for exiv2-0.27 Import gentoo's patch: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch PR: 235943 --- graphics/ufraw/Makefile | 2 +- graphics/ufraw/files/patch-gentoo_b5b414 | 28 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 graphics/ufraw/files/patch-gentoo_b5b414 diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 3e023739d62e..7424fd3d13c7 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.22 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MAINTAINER= rodrigo@FreeBSD.org diff --git a/graphics/ufraw/files/patch-gentoo_b5b414 b/graphics/ufraw/files/patch-gentoo_b5b414 new file mode 100644 index 000000000000..f9f107b26ebc --- /dev/null +++ b/graphics/ufraw/files/patch-gentoo_b5b414 @@ -0,0 +1,28 @@ +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch + +--- ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200 ++++ ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100 +@@ -15,9 +15,7 @@ + #include "ufraw.h" + + #ifdef HAVE_EXIV2 +-#include +-#include +-#include ++#include + #include + #include + +@@ -67,7 +65,11 @@ + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); ++#else + throw Exiv2::Error(1, error); ++#endif + } + + /* List of tag names taken from exiv2's printSummary() in actions.cpp */ +