Control: tags -1 + patch X-Debbugs-CC: sunwea...@debian.org mariog...@debian.org
Hi, On Fri, 10 Jan 2025 12:07:39 -0500 Boyuan Yang <by...@debian.org> wrote:
Source: lomiri-thumbnailer Version: 3.0.3-1 Severity: important User: debian-multime...@lists.debian.org Usertags: taglib2.0 The package fails to build with taglib 2.0.2 from Debian experimental. There are API breakages between taglib 1.x and taglib 2.x, and some manual tweaks may be necessary. This issue affects lomiri-thumbnailer in both 3.0.3-1 and 3.0.4-1.
Please find my proposed patch in the attachment. Thanks, Boyuan Yang
diff -Nru lomiri-thumbnailer-3.0.4/debian/changelog
lomiri-thumbnailer-3.0.4/debian/changelog
--- lomiri-thumbnailer-3.0.4/debian/changelog 2025-01-07 04:35:20.000000000
-0500
+++ lomiri-thumbnailer-3.0.4/debian/changelog 2025-01-12 17:22:28.000000000
-0500
@@ -1,3 +1,10 @@
+lomiri-thumbnailer (3.0.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix taglib 2.x compat.
+
+ -- Boyuan Yang <by...@debian.org> Sun, 12 Jan 2025 17:22:28 -0500
+
lomiri-thumbnailer (3.0.4-1) unstable; urgency=medium
* New upstream release.
diff -Nru lomiri-thumbnailer-3.0.4/debian/control
lomiri-thumbnailer-3.0.4/debian/control
--- lomiri-thumbnailer-3.0.4/debian/control 2025-01-07 04:35:03.000000000
-0500
+++ lomiri-thumbnailer-3.0.4/debian/control 2025-01-12 17:22:28.000000000
-0500
@@ -25,7 +25,7 @@
libleveldb-dev,
libqtdbustest1-dev,
librsvg2-common,
- libtag1-dev,
+ libtag-dev,
liblomiri-api-dev,
licensecheck,
lsb-release,
diff -Nru
lomiri-thumbnailer-3.0.4/debian/patches/0004-Fix-taglib-2.x-compatibility.patch
lomiri-thumbnailer-3.0.4/debian/patches/0004-Fix-taglib-2.x-compatibility.patch
---
lomiri-thumbnailer-3.0.4/debian/patches/0004-Fix-taglib-2.x-compatibility.patch
1969-12-31 19:00:00.000000000 -0500
+++
lomiri-thumbnailer-3.0.4/debian/patches/0004-Fix-taglib-2.x-compatibility.patch
2025-01-12 17:21:56.000000000 -0500
@@ -0,0 +1,29 @@
+From: Boyuan Yang <by...@debian.org>
+Date: Sun, 12 Jan 2025 17:21:55 -0500
+Subject: Fix taglib 2.x compatibility
+
+---
+ src/local_album_art.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/local_album_art.cpp b/src/local_album_art.cpp
+index 2325888..b2dc5c3 100644
+--- a/src/local_album_art.cpp
++++ b/src/local_album_art.cpp
+@@ -39,6 +39,7 @@
+
+ #include <cassert>
+ #include <memory>
++#include <stdexcept>
+
+ using namespace std;
+
+@@ -336,7 +337,7 @@ string MP4Extractor::get_album_art() const
+ if (tag)
+ {
+ // Despite the name, this returns a map<String, Item>, not
map<String, ItemList>.
+- auto const& map = const_cast<TagLib::MP4::Tag*>(tag)->itemListMap();
++ auto const& map = const_cast<TagLib::MP4::Tag*>(tag)->itemMap();
+ auto const it = map.find("covr");
+ if (it != map.end())
+ {
diff -Nru lomiri-thumbnailer-3.0.4/debian/patches/series
lomiri-thumbnailer-3.0.4/debian/patches/series
--- lomiri-thumbnailer-3.0.4/debian/patches/series 2025-01-07
04:35:20.000000000 -0500
+++ lomiri-thumbnailer-3.0.4/debian/patches/series 2025-01-12
17:21:56.000000000 -0500
@@ -1,3 +1,4 @@
1001_rename_apport_directory.patch
2001_dont-check-whitespaces-in-debian-subfolder.patch
1300_disable_qml_and_dbus_tests.patch
+0004-Fix-taglib-2.x-compatibility.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
