Control: tags 1106283 + pending Control: tags 1113157 + patch Control: tags 1113157 + pending
Dear maintainer, I've prepared an NMU for libid3tag (versioned as 0.16.3-1.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for libid3tag-0.16.3 libid3tag-0.16.3 changelog | 10 +++++ control | 1 patches/0001-Allow-build-with-CMake-4.0.0.patch | 25 +++++++++++++ patches/10_utf16.patch | 45 ------------------------ patches/series | 2 - 5 files changed, 37 insertions(+), 46 deletions(-) diff -Nru libid3tag-0.16.3/debian/changelog libid3tag-0.16.3/debian/changelog --- libid3tag-0.16.3/debian/changelog 2024-10-09 08:37:18.000000000 +0300 +++ libid3tag-0.16.3/debian/changelog 2025-11-14 22:04:34.000000000 +0200 @@ -1,3 +1,13 @@ +libid3tag (0.16.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with CMake 4. (Closes: #1113157) + * Remove patch already included upstream, thanks to Brian Arnold. + (Closes: #1106283) + * debian/control: Add Homepage. + + -- Adrian Bunk <[email protected]> Fri, 14 Nov 2025 22:04:34 +0200 + libid3tag (0.16.3-1) unstable; urgency=medium * Team upload. diff -Nru libid3tag-0.16.3/debian/control libid3tag-0.16.3/debian/control --- libid3tag-0.16.3/debian/control 2024-10-09 08:37:18.000000000 +0300 +++ libid3tag-0.16.3/debian/control 2025-11-14 22:04:34.000000000 +0200 @@ -9,6 +9,7 @@ Maintainer: Debian Multimedia Maintainers <[email protected]> Uploaders: Kurt Roeckx <[email protected]> Standards-Version: 4.7.0 +Homepage: https://codeberg.org/tenacityteam/libid3tag Vcs-Browser: https://salsa.debian.org/multimedia-team/libid3tag Vcs-Git: https://salsa.debian.org/multimedia-team/libid3tag.git diff -Nru libid3tag-0.16.3/debian/patches/0001-Allow-build-with-CMake-4.0.0.patch libid3tag-0.16.3/debian/patches/0001-Allow-build-with-CMake-4.0.0.patch --- libid3tag-0.16.3/debian/patches/0001-Allow-build-with-CMake-4.0.0.patch 1970-01-01 02:00:00.000000000 +0200 +++ libid3tag-0.16.3/debian/patches/0001-Allow-build-with-CMake-4.0.0.patch 2025-11-14 22:03:59.000000000 +0200 @@ -0,0 +1,25 @@ +From 11d6c44f41b97ed4b8091e67166c5821138f1b3d Mon Sep 17 00:00:00 2001 +From: heitbaum <[email protected]> +Date: Thu, 1 May 2025 05:34:30 +0000 +Subject: Allow build with CMake 4.0.0 + +CMake 4.0.0 deprecates CMake syntax < 3.10. Update to using a minimum of 3.10. + +ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d181300..083b5f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.10) + project(id3tag VERSION 0.16.3) + + option(BUILD_SHARED_LIBS "Build dynamic library" ON) +-- +2.30.2 + diff -Nru libid3tag-0.16.3/debian/patches/10_utf16.patch libid3tag-0.16.3/debian/patches/10_utf16.patch --- libid3tag-0.16.3/debian/patches/10_utf16.patch 2024-10-09 08:37:18.000000000 +0300 +++ libid3tag-0.16.3/debian/patches/10_utf16.patch 1970-01-01 02:00:00.000000000 +0200 @@ -1,45 +0,0 @@ -Author: Kurt Roeckx <[email protected]> -Last-Update: 2006-01-13 15:32:41 +0100 -Description: Handle bogus UTF16 sequences that have a length that is not - an even number of 8 bit characters. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- a/utf16.c -+++ b/utf16.c -@@ -293,5 +293,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by - (*ptr)++; - } - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } diff -Nru libid3tag-0.16.3/debian/patches/series libid3tag-0.16.3/debian/patches/series --- libid3tag-0.16.3/debian/patches/series 2024-10-09 08:37:18.000000000 +0300 +++ libid3tag-0.16.3/debian/patches/series 2025-11-14 22:04:34.000000000 +0200 @@ -1,2 +1,2 @@ -10_utf16.patch # static_lib.patch +0001-Allow-build-with-CMake-4.0.0.patch
