From 97e450930531dd29155a2f7bb4c59e1309781351 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 1 Jan 2019 23:41:37 +0100 Subject: [PATCH] ufraw: rebuild against exiv2-0.27.0_1 [ci skip] --- srcpkgs/ufraw/patches/exiv-0.27.patch | 25 +++++++++++++++++++++++++ srcpkgs/ufraw/template | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ufraw/patches/exiv-0.27.patch diff --git a/srcpkgs/ufraw/patches/exiv-0.27.patch b/srcpkgs/ufraw/patches/exiv-0.27.patch new file mode 100644 index 00000000000..2d1251aa1e3 --- /dev/null +++ b/srcpkgs/ufraw/patches/exiv-0.27.patch @@ -0,0 +1,25 @@ +--- 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 */ diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template index c8c57fa73a1..2a6b30b7e7c 100644 --- a/srcpkgs/ufraw/template +++ b/srcpkgs/ufraw/template @@ -1,7 +1,7 @@ # Template file for 'ufraw' pkgname=ufraw version=0.22 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp $(vopt_enable extras)" @@ -9,10 +9,10 @@ hostmakedepends="pkg-config dcraw" makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel jasper-devel" depends="desktop-file-utils" -maintainer="John " short_desc="Utility to read and manipulate raw images from digital cameras" +maintainer="John " +license="GPL-2.0-or-later" homepage="http://ufraw.sourceforge.net/" -license="GPL-2" distfiles="${SOURCEFORGE_SITE}/ufraw/ufraw/ufraw-${version}/ufraw-${version}.tar.gz" checksum=f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e