diff -pruN 2:1.2.4-16/debian/changelog 2:1.2.4-17/debian/changelog --- 2:1.2.4-16/debian/changelog 2024-03-13 22:48:14.000000000 +0000 +++ 2:1.2.4-17/debian/changelog 2025-09-08 14:19:21.000000000 +0000 @@ -1,3 +1,14 @@ +libquicktime (2:1.2.4-17) unstable; urgency=medium + + * Backported patch to fix FTBFS with gcc-15 (Closes: #1097258) + * Mark patches applied upstream as such + * Update copyright information + + Fix old FSF-address in d/copyright + + Bump copyright dates + * Bump standards version to 4.7.2 + + -- IOhannes m zmölnig (Debian/GNU) Mon, 08 Sep 2025 16:19:21 +0200 + libquicktime (2:1.2.4-16) unstable; urgency=medium * Team upload. diff -pruN 2:1.2.4-16/debian/control 2:1.2.4-17/debian/control --- 2:1.2.4-16/debian/control 2024-03-13 22:47:13.000000000 +0000 +++ 2:1.2.4-17/debian/control 2025-09-08 14:19:21.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: IOhannes m zmölnig (Debian/GNU) , Reinhard Tartler , Loic Minier , -Standards-Version: 4.6.2 +Standards-Version: 4.7.2 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), diff -pruN 2:1.2.4-16/debian/copyright 2:1.2.4-17/debian/copyright --- 2:1.2.4-16/debian/copyright 2024-03-13 22:45:37.000000000 +0000 +++ 2:1.2.4-17/debian/copyright 2025-09-08 14:19:21.000000000 +0000 @@ -56,7 +56,7 @@ Copyright: 2005-2017, Reinhard Tartler s 2018, Felipe Sateler fsateler@debian.org 2018, James Cowgill jcowgill@debian.org 2018-2019, Ondřej Nový onovy@debian.org - 2022-2023, IOhannes m zmölnig (Debian/GNU) umlaeute@debian.org + 2022-2025, IOhannes m zmölnig (Debian/GNU) umlaeute@debian.org License: LGPL-2.1+ License: LGPL-2.1+ @@ -71,7 +71,7 @@ License: LGPL-2.1+ Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library. + If not, see . Comment: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff -pruN 2:1.2.4-16/debian/patches/0012-Add-missing-include.patch 2:1.2.4-17/debian/patches/0012-Add-missing-include.patch --- 2:1.2.4-16/debian/patches/0012-Add-missing-include.patch 2024-03-13 22:46:26.000000000 +0000 +++ 2:1.2.4-17/debian/patches/0012-Add-missing-include.patch 2025-09-08 14:19:21.000000000 +0000 @@ -1,6 +1,8 @@ From: Sebastian Ramacher Date: Wed, 13 Mar 2024 23:46:23 +0100 Subject: Add missing include +Applied-Upstream: 55f5d4523a96cdf2a45a3af81b8d251337c5d020 +Forwarded: not-needed --- plugins/png/qtpng.c | 1 + diff -pruN 2:1.2.4-16/debian/patches/CVE-2016-2399.patch 2:1.2.4-17/debian/patches/CVE-2016-2399.patch --- 2:1.2.4-16/debian/patches/CVE-2016-2399.patch 2024-03-13 22:46:26.000000000 +0000 +++ 2:1.2.4-17/debian/patches/CVE-2016-2399.patch 2025-09-08 14:19:21.000000000 +0000 @@ -1,6 +1,9 @@ From: Debian Multimedia Maintainers Date: Wed, 30 Aug 2023 15:19:30 +0200 Subject: CVE-2016-2399 +Applied-Upstream: bf6e842131fb013a087df6d7c5069a7d3646b199 +Origin: upstream +Forwarded: not-needed --- src/util.c | 11 ++++++++--- diff -pruN 2:1.2.4-16/debian/patches/CVE-2017-9122_et_al.patch 2:1.2.4-17/debian/patches/CVE-2017-9122_et_al.patch --- 2:1.2.4-16/debian/patches/CVE-2017-9122_et_al.patch 2024-03-13 22:46:26.000000000 +0000 +++ 2:1.2.4-17/debian/patches/CVE-2017-9122_et_al.patch 2025-09-08 14:19:21.000000000 +0000 @@ -1,7 +1,8 @@ From: Burkhard Plaum Date: Wed, 30 Aug 2023 15:19:30 +0200 Subject: CVE-2017-9122_et_al - +Applied-Upstream: c166ad0b5d00265d6a0a708ed1d39772bfaa8a91, 3a7b5017e5d803dbe82eddd08a2804be3fda0c5d, bfe392e31eea480d7c4507663395ca483a5abb67 +Forwarded: not-needed Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706 Hi, @@ -34,11 +35,9 @@ Burkhard src/util.c | 22 +++++++++++----------- 6 files changed, 29 insertions(+), 17 deletions(-) -diff --git a/include/lqt_funcprotos.h b/include/lqt_funcprotos.h -index 9a51877..ac8d730 100644 ---- a/include/lqt_funcprotos.h -+++ b/include/lqt_funcprotos.h -@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t *file, long value); +--- libquicktime.orig/include/lqt_funcprotos.h ++++ libquicktime/include/lqt_funcprotos.h +@@ -1345,9 +1345,9 @@ int quicktime_write_char32(quicktime_t *file, char *string); float quicktime_read_fixed16(quicktime_t *file); int quicktime_write_fixed16(quicktime_t *file, float number); @@ -51,11 +50,9 @@ index 9a51877..ac8d730 100644 int64_t quicktime_read_int64(quicktime_t *file); int64_t quicktime_read_int64_le(quicktime_t *file); long quicktime_read_int24(quicktime_t *file); -diff --git a/src/atom.c b/src/atom.c -index c67c1d5..e57a253 100644 ---- a/src/atom.c -+++ b/src/atom.c -@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime_t *file, quicktime_atom_t *atom) +--- libquicktime.orig/src/atom.c ++++ libquicktime/src/atom.c +@@ -131,6 +131,9 @@ atom->size = read_size64(header); atom->end = atom->start + atom->size; } @@ -65,11 +62,9 @@ index c67c1d5..e57a253 100644 } -diff --git a/src/lqt_quicktime.c b/src/lqt_quicktime.c -index dc5ea71..c0af359 100644 ---- a/src/lqt_quicktime.c -+++ b/src/lqt_quicktime.c -@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *file) +--- libquicktime.orig/src/lqt_quicktime.c ++++ libquicktime/src/lqt_quicktime.c +@@ -1788,8 +1788,8 @@ quicktime_set_position(file, start_position); free(temp); @@ -80,11 +75,9 @@ index dc5ea71..c0af359 100644 } else quicktime_atom_skip(file, &leaf_atom); -diff --git a/src/moov.c b/src/moov.c -index 1a39d52..3642689 100644 ---- a/src/moov.c -+++ b/src/moov.c -@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *file, quicktime_moov_t *moov, quicktime_ato +--- libquicktime.orig/src/moov.c ++++ libquicktime/src/moov.c +@@ -218,7 +218,8 @@ if(quicktime_atom_is(&leaf_atom, "trak")) { quicktime_trak_t *trak = quicktime_add_trak(file); @@ -94,11 +87,9 @@ index 1a39d52..3642689 100644 } else if(quicktime_atom_is(&leaf_atom, "udta")) -diff --git a/src/trak.c b/src/trak.c -index 649d81c..971c37d 100644 ---- a/src/trak.c -+++ b/src/trak.c -@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *file, quicktime_trak_t *trak, +--- libquicktime.orig/src/trak.c ++++ libquicktime/src/trak.c +@@ -269,6 +269,14 @@ else quicktime_atom_skip(file, &leaf_atom); } while(quicktime_position(file) < trak_atom->end); @@ -113,11 +104,9 @@ index 649d81c..971c37d 100644 #if 1 if(trak->mdia.minf.is_video && quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac")) -diff --git a/src/util.c b/src/util.c -index 9422fc5..4c9f702 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t *file, float number) +--- libquicktime.orig/src/util.c ++++ libquicktime/src/util.c +@@ -647,10 +647,10 @@ return quicktime_write_data(file, data, 2); } @@ -131,7 +120,7 @@ index 9422fc5..4c9f702 100644 uint8_t data[4]; quicktime_read_data(file, data, 4); -@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quicktime_t *file) +@@ -663,10 +663,10 @@ return result; } @@ -145,7 +134,7 @@ index 9422fc5..4c9f702 100644 uint8_t data[4]; quicktime_read_data(file, data, 4); -@@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *file) +@@ -676,13 +676,13 @@ d = data[3]; result = (a << 24) | (b << 16) | (c << 8) | d; @@ -163,7 +152,7 @@ index 9422fc5..4c9f702 100644 uint8_t data[4]; quicktime_read_data(file, data, 4); -@@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t *file) +@@ -692,7 +692,7 @@ d = data[3]; result = (d << 24) | (c << 16) | (b << 8) | a; diff -pruN 2:1.2.4-16/debian/patches/auto-gitignore 2:1.2.4-17/debian/patches/auto-gitignore --- 2:1.2.4-16/debian/patches/auto-gitignore 1970-01-01 00:00:00.000000000 +0000 +++ 2:1.2.4-17/debian/patches/auto-gitignore 2025-09-08 14:19:21.000000000 +0000 @@ -0,0 +1,15 @@ +Subject: Update .gitignore from Debian packaging branch + +The Debian packaging git branch contains these updates to the upstream +.gitignore file(s). This patch is autogenerated, to provide these +updates to users of the official Debian archive view of the package. + +[dgit (13.13) update-gitignore] +--- +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..b408e6c +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1 @@ ++/.pc diff -pruN 2:1.2.4-16/debian/patches/gcc15.patch 2:1.2.4-17/debian/patches/gcc15.patch --- 2:1.2.4-16/debian/patches/gcc15.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:1.2.4-17/debian/patches/gcc15.patch 2025-09-08 14:19:21.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Fix FTBFS with gcc15 + decode_audio takes no arguments. remove the argument so the error goes away. +Author: Steven Schultz +Origin: upstream +Forwarded: https://sourceforge.net/p/libquicktime/git/ci/5aba9baafc67b0e3bb7bc77689ec11a2ada6371b/ +Applied-Upstream: 5aba9baafc67b0e3bb7bc77689ec11a2ada6371b +Reviewed-by: IOhannes m zmölnig +Last-Update: 2025-09-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- libquicktime.orig/utils/lqtplay.c ++++ libquicktime/utils/lqtplay.c +@@ -1477,7 +1477,7 @@ + while(!done) { + /* Decode new audio samples */ + if(!qt_audio_samples_in_buffer) +- decode_audio(AUDIO_BLOCK_SIZE); ++ decode_audio(); + ret = snd_pcm_writei(pcm_handle, (void *)(qt_audio_ptr), qt_audio_samples_in_buffer); + if (ret == -EAGAIN) { + ret = 0; +@@ -1515,7 +1515,7 @@ + int rc, n, revents; + + if(!qt_audio_samples_in_buffer) +- decode_audio(AUDIO_BLOCK_SIZE); ++ decode_audio(); + + /* this code is absolutely horrible. do not follow this example. */ + +@@ -1557,7 +1557,7 @@ + int rc; + + if(!qt_audio_samples_in_buffer) +- decode_audio(AUDIO_BLOCK_SIZE); ++ decode_audio(); + + rc = write(oss_fd,qt_audio_ptr,qt_audio_samples_in_buffer * qt_channels * sizeof(*qt_audio)); + switch (rc) { diff -pruN 2:1.2.4-16/debian/patches/series 2:1.2.4-17/debian/patches/series --- 2:1.2.4-16/debian/patches/series 2024-03-13 22:46:26.000000000 +0000 +++ 2:1.2.4-17/debian/patches/series 2025-09-08 14:19:21.000000000 +0000 @@ -10,3 +10,5 @@ reproducible-docs.patch cross-build.patch spelling.patch 0012-Add-missing-include.patch +gcc15.patch +auto-gitignore