Control: tags 1076761 + pending
Dear maintainer,
I've prepared an NMU for lomiri-gallery-app (versioned as 3.0.2-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru lomiri-gallery-app-3.0.2/debian/changelog
lomiri-gallery-app-3.0.2/debian/changelog
--- lomiri-gallery-app-3.0.2/debian/changelog 2024-02-04 23:56:38.000000000
+0100
+++ lomiri-gallery-app-3.0.2/debian/changelog 2024-09-03 07:29:49.000000000
+0200
@@ -1,3 +1,12 @@
+lomiri-gallery-app (3.0.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream commit be63c6d3497ece568f1d8a3629e6e48006129e4f to make
+ lomiri-gallery-app compatible with Exiv2 0.28+; patch
+ 0001-Support-Exiv2-0.28.patch (Closes: #1076761)
+
+ -- Pino Toscano <p...@debian.org> Tue, 03 Sep 2024 07:29:49 +0200
+
lomiri-gallery-app (3.0.2-1) unstable; urgency=medium
* New upstream release.
diff -Nru lomiri-gallery-app-3.0.2/debian/patches/0001-Support-Exiv2-0.28.patch
lomiri-gallery-app-3.0.2/debian/patches/0001-Support-Exiv2-0.28.patch
--- lomiri-gallery-app-3.0.2/debian/patches/0001-Support-Exiv2-0.28.patch
1970-01-01 01:00:00.000000000 +0100
+++ lomiri-gallery-app-3.0.2/debian/patches/0001-Support-Exiv2-0.28.patch
2024-09-03 07:28:38.000000000 +0200
@@ -0,0 +1,87 @@
+From be63c6d3497ece568f1d8a3629e6e48006129e4f Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Thu, 14 Mar 2024 07:16:37 +0100
+Subject: [PATCH] Support Exiv2 0.28+
+
+Use the new types for the image pointer and exception class, and the
+different method for the EXIF_ORIENTATION_KEY exif metadata, as
+available in the new Exiv2 version, keeping the support for older
+versions.
+
+Fixes #123
+---
+ src/photo/photo-metadata.cpp | 16 ++++++++++++++++
+ src/photo/photo-metadata.h | 4 ++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/src/photo/photo-metadata.cpp b/src/photo/photo-metadata.cpp
+index ac4a0b05..dd6e1907 100644
+--- a/src/photo/photo-metadata.cpp
++++ b/src/photo/photo-metadata.cpp
+@@ -134,7 +134,11 @@ PhotoMetadata* PhotoMetadata::fromFile(const char*
filepath)
+ result->m_keysPresent.insert(QString(i->key().c_str()));
+
+ return result;
++#if EXIV2_TEST_VERSION(0,28,0)
++ } catch (Exiv2::Error& e) {
++#else
+ } catch (Exiv2::AnyError& e) {
++#endif
+ qDebug("Error loading image metadata: %s", e.what());
+ delete result;
+ return NULL;
+@@ -165,7 +169,11 @@ Orientation PhotoMetadata::orientation() const
+ if (m_keysPresent.find(EXIF_ORIENTATION_KEY) == m_keysPresent.end())
+ return DEFAULT_ORIENTATION;
+
++#if EXIV2_TEST_VERSION(0,28,0)
++ uint32_t orientation_code = exif_data[EXIF_ORIENTATION_KEY].toUint32();
++#else
+ long orientation_code = exif_data[EXIF_ORIENTATION_KEY].toLong();
++#endif
+ if (orientation_code < MIN_ORIENTATION || orientation_code >
MAX_ORIENTATION)
+ return DEFAULT_ORIENTATION;
+
+@@ -244,7 +252,11 @@ void PhotoMetadata::setDateTimeDigitized(const QDateTime&
digitized)
+ if (!m_keysPresent.contains(EXIF_DATETIMEDIGITIZED_KEY))
+ m_keysPresent.insert(EXIF_DATETIMEDIGITIZED_KEY);
+
++#if EXIV2_TEST_VERSION(0,28,0)
++ } catch (Exiv2::Error& e) {
++#else
+ } catch (Exiv2::AnyError& e) {
++#endif
+ qDebug("Do not set DateTimeDigitized, error reading image metadata;
%s", e.what());
+ return;
+ }
+@@ -259,7 +271,11 @@ bool PhotoMetadata::save() const
+ try {
+ m_image->writeMetadata();
+ return true;
++#if EXIV2_TEST_VERSION(0,28,0)
++ } catch (Exiv2::Error& e) {
++#else
+ } catch (Exiv2::AnyError& e) {
++#endif
+ return false;
+ }
+ }
+diff --git a/src/photo/photo-metadata.h b/src/photo/photo-metadata.h
+index a2687b8d..daf2ee49 100644
+--- a/src/photo/photo-metadata.h
++++ b/src/photo/photo-metadata.h
+@@ -59,7 +59,11 @@ public:
+ private:
+ PhotoMetadata(const char* filepath);
+
++#if EXIV2_TEST_VERSION(0,28,0)
++ Exiv2::Image::UniquePtr m_image;
++#else
+ Exiv2::Image::AutoPtr m_image;
++#endif
+ QSet<QString> m_keysPresent;
+ QFileInfo m_fileSourceInfo;
+ };
+--
+2.45.2
+
diff -Nru lomiri-gallery-app-3.0.2/debian/patches/series
lomiri-gallery-app-3.0.2/debian/patches/series
--- lomiri-gallery-app-3.0.2/debian/patches/series 2023-01-30
22:58:18.000000000 +0100
+++ lomiri-gallery-app-3.0.2/debian/patches/series 2024-09-03
07:28:46.000000000 +0200
@@ -1 +1,2 @@
2001_build-without-Werror.patch
+0001-Support-Exiv2-0.28.patch
