ufraw: rebuild against exiv2-0.27.0_1

[ci skip]
This commit is contained in:
Rasmus Thomsen 2019-01-01 23:41:37 +01:00 committed by Helmut Pozimski
parent 83aa771bdb
commit 97e4509305
2 changed files with 28 additions and 3 deletions

View File

@ -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 <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 */

View File

@ -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 <johnz@posteo.net>"
short_desc="Utility to read and manipulate raw images from digital cameras"
maintainer="John <johnz@posteo.net>"
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