Control: tags 1081026 + pending
Dear maintainer, I've prepared an NMU for gimplensfun (versioned as 0.2.4-1.2) and uploaded it to DELAYED/11. Please feel free to tell me if I should delay it longer. Regards. diff -Nru gimplensfun-0.2.4/debian/changelog gimplensfun-0.2.4/debian/changelog --- gimplensfun-0.2.4/debian/changelog 2020-02-06 00:52:20.000000000 +0100 +++ gimplensfun-0.2.4/debian/changelog 2024-09-07 07:14:22.000000000 +0200 @@ -1,3 +1,12 @@ +gimplensfun (0.2.4-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Backport the upstream PR https://github.com/seebk/GIMP-Lensfun/pull/30 to + make it build with Exiv2 0.28+; patch 0001-Support-Exiv2-0.28.patch. + (Closes: #1081026) + + -- Pino Toscano <p...@debian.org> Sat, 07 Sep 2024 07:14:22 +0200 + gimplensfun (0.2.4-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gimplensfun-0.2.4/debian/patches/0001-Support-Exiv2-0.28.patch gimplensfun-0.2.4/debian/patches/0001-Support-Exiv2-0.28.patch --- gimplensfun-0.2.4/debian/patches/0001-Support-Exiv2-0.28.patch 1970-01-01 01:00:00.000000000 +0100 +++ gimplensfun-0.2.4/debian/patches/0001-Support-Exiv2-0.28.patch 2024-09-07 07:13:32.000000000 +0200 @@ -0,0 +1,44 @@ +Author: Pino Toscano <toscano.p...@tiscali.it> +Description: Support Exiv2 0.28+ + Use the new types for the image pointer and exception class, as + available in the new Exiv2 version, keeping the support for older + versions. + . + Fixes #29 +Last-Update: 2024-09-07 +Forwarded: https://github.com/seebk/GIMP-Lensfun/pull/30 + +--- a/src/gimplensfun.cpp ++++ b/src/gimplensfun.cpp +@@ -34,6 +34,7 @@ + #include <exiv2/error.hpp> + #include <exiv2/image.hpp> + #include <exiv2/exif.hpp> ++#include <exiv2/version.hpp> + + #define VERSIONSTR "0.2.4" + +@@ -1033,7 +1034,11 @@ static void process_image (GimpDrawable + // + static int read_opts_from_exif(const char *filename) { + ++#if EXIV2_TEST_VERSION(0,28,0) ++ Exiv2::Image::UniquePtr Exiv2image; ++#else + Exiv2::Image::AutoPtr Exiv2image; ++#endif + Exiv2::ExifData exifData; + + const lfCamera **cameras = 0; +@@ -1061,7 +1066,11 @@ static int read_opts_from_exif(const cha + return -1; + } + } ++#if EXIV2_TEST_VERSION(0,28,0) ++ catch (Exiv2::Error& e) { ++#else + catch (Exiv2::AnyError& e) { ++#endif + if (DEBUG) { + g_print ("exception on reading data. \n"); + } diff -Nru gimplensfun-0.2.4/debian/patches/series gimplensfun-0.2.4/debian/patches/series --- gimplensfun-0.2.4/debian/patches/series 2020-02-06 00:51:59.000000000 +0100 +++ gimplensfun-0.2.4/debian/patches/series 2024-09-07 07:13:32.000000000 +0200 @@ -1,2 +1,3 @@ 01-debian-cflags-ldflags.patch 02-add-missing-header.patch +0001-Support-Exiv2-0.28.patch
