[packages/ufraw] - added exiv2-0.28 patch, release 17

qboosh qboosh at pld-linux.org
Fri Jul 28 10:25:49 CEST 2023


commit 30503e255d6bb5eb419ff59424f7c8b407d31d89
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 28 09:13:07 2023 +0200

    - added exiv2-0.28 patch, release 17

 ufraw-exiv2-0.28.patch | 38 ++++++++++++++++++++++++++++++++++++++
 ufraw.spec             |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/ufraw.spec b/ufraw.spec
index e24d08f..96881c8 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:	16
+Release:	17
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ufraw/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch4:		exiv2-0.27.patch
 Patch5:		%{name}-include.patch
 Patch6:		%{name}-openmp.patch
 Patch7:		%{name}-c++.patch
+Patch8:		%{name}-exiv2-0.28.patch
 URL:		http://ufraw.sourceforge.net/
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -115,6 +116,7 @@ Wtyczka GIMP-a do wczytywania zdjęć w formacie RAW.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 cp -f /usr/share/automake/mkinstalldirs .
diff --git a/ufraw-exiv2-0.28.patch b/ufraw-exiv2-0.28.patch
new file mode 100644
index 0000000..05ee517
--- /dev/null
+++ b/ufraw-exiv2-0.28.patch
@@ -0,0 +1,38 @@
+--- ufraw-0.22/ufraw_exiv2.cc.orig	2023-07-28 08:19:03.306308221 +0200
++++ ufraw-0.22/ufraw_exiv2.cc	2023-07-28 09:10:13.476342349 +0200
+@@ -19,6 +19,12 @@
+ #include <iostream>
+ #include <sstream>
+ #include <cassert>
++#include <cinttypes>
++
++#if EXIV2_TEST_VERSION(0,28,0)
++#define AutoPtr UniquePtr
++#define AnyError Error
++#endif
+ 
+ /*
+  * Helper function to copy a string to a buffer, converting it from
+@@ -67,7 +73,11 @@ extern "C" int ufraw_exif_read_input(ufr
+             std::string error(uf->filename);
+             error += ": No Exif data found in the file";
+ #if EXIV2_TEST_VERSION(0,27,0)
++#if EXIV2_TEST_VERSION(0,28,0)
++            throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error);
++#else
+             throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#endif
+ #else
+             throw Exiv2::Error(1, error);
+ #endif
+@@ -155,8 +165,8 @@ static Exiv2::ExifData ufraw_prepare_exi
+         /* Reset orientation tag since UFRaw already rotates the image */
+         if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation")))
+                 != exifData.end()) {
+-            ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n",
+-                          pos->key().c_str(), pos->value().toLong());
++            ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%" PRId64 "' to '1'\n",
++                          pos->key().c_str(), pos->value().toInt64());
+             pos->setValue("1"); /* 1 = Normal orientation */
+         }
+     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ufraw.git/commitdiff/30503e255d6bb5eb419ff59424f7c8b407d31d89



More information about the pld-cvs-commit mailing list