1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

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
This commit is contained in:
Tobias C. Berner 2019-03-08 21:29:25 +00:00
parent 466adaac72
commit 2d36cee9cd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495076
2 changed files with 29 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= ufraw
PORTVERSION= 0.22
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= graphics
MAINTAINER= rodrigo@FreeBSD.org

View File

@ -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 <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <sstream>
#include <cassert>
@@ -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 */