Date: Fri, 8 Mar 2019 21:29:26 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495076 - in head/graphics/ufraw: . files Message-ID: <201903082129.x28LTQc9038267@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Mar 8 21:29:25 2019 New Revision: 495076 URL: https://svnweb.freebsd.org/changeset/ports/495076 Log: 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 Added: head/graphics/ufraw/files/patch-gentoo_b5b414 (contents, props changed) Modified: head/graphics/ufraw/Makefile Modified: head/graphics/ufraw/Makefile ============================================================================== --- head/graphics/ufraw/Makefile Fri Mar 8 21:18:42 2019 (r495075) +++ head/graphics/ufraw/Makefile Fri Mar 8 21:29:25 2019 (r495076) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.22 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MAINTAINER= rodrigo@FreeBSD.org Added: head/graphics/ufraw/files/patch-gentoo_b5b414 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ufraw/files/patch-gentoo_b5b414 Fri Mar 8 21:29:25 2019 (r495076) @@ -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 */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903082129.x28LTQc9038267>