commit 528866927321ba6245cfee0809b36ec149df4077
Author: Jan Rękorajski <[email protected]>
Date: Mon Feb 11 20:57:32 2019 +0100
- fix building with exiv2 0.27
- rel 11
exiv2-0.27.patch | 25 +++++++++++++++++++++++++
ufraw.spec | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/ufraw.spec b/ufraw.spec
index 9009c11..9f83f50 100644
--- a/ufraw.spec
+++ b/ufraw.spec
@@ -7,7 +7,7 @@ Summary: RAW photo loader
Summary(pl.UTF-8): Narzędzie do wczytywania zdjęć w formacie RAW
Name: ufraw
Version: 0.22
-Release: 10
+Release: 11
License: GPL v2+
Group: Applications/Graphics
Source0: http://downloads.sourceforge.net/ufraw/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch0: 05_fix_build_due_to_unsigned_char.patch
Patch1: ufraw-find_green.patch
Patch2: ufraw-lf-destroy.patch
Patch3: ufraw-multipliers.patch
+Patch4: exiv2-0.27.patch
URL: http://ufraw.sourceforge.net/
BuildRequires: automake
BuildRequires: bzip2-devel
@@ -107,6 +108,7 @@ Wtyczka GIMP-a do wczytywania zdjęć w formacie RAW.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
cp -f /usr/share/automake/mkinstalldirs .
diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch
new file mode 100644
index 0000000..b5b4140
--- /dev/null
+++ b/exiv2-0.27.patch
@@ -0,0 +1,25 @@
+--- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200
++++ b/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
*/
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ufraw.git/commitdiff/528866927321ba6245cfee0809b36ec149df4077
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
