Control: tags 1096526 + patch Control: tags 1096526 + pending Dear maintainer,
I've prepared an NMU for dillo (versioned as 3.0.5-7.2) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for dillo-3.0.5 dillo-3.0.5 changelog | 7 +++++ patches/gcc-15.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 70 insertions(+) diff -Nru dillo-3.0.5/debian/changelog dillo-3.0.5/debian/changelog --- dillo-3.0.5/debian/changelog 2024-08-09 00:50:12.000000000 +0300 +++ dillo-3.0.5/debian/changelog 2025-10-04 22:56:32.000000000 +0300 @@ -1,3 +1,10 @@ +dillo (3.0.5-7.2) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fixes for FTBFS with GCC 15. (Closes: #1096526) + + -- Adrian Bunk <[email protected]> Sat, 04 Oct 2025 22:56:32 +0300 + dillo (3.0.5-7.1) unstable; urgency=medium [ Axel Beckert ] diff -Nru dillo-3.0.5/debian/patches/gcc-15.patch dillo-3.0.5/debian/patches/gcc-15.patch --- dillo-3.0.5/debian/patches/gcc-15.patch 1970-01-01 02:00:00.000000000 +0200 +++ dillo-3.0.5/debian/patches/gcc-15.patch 2025-10-04 22:56:32.000000000 +0300 @@ -0,0 +1,62 @@ +Description: Fix FTBFS with GCC 15 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1096526 +Origin: backport + +--- dillo-3.0.5.orig/lout/misc.hh ++++ dillo-3.0.5/lout/misc.hh +@@ -325,23 +325,6 @@ public: + this->startExtra = -1; + } + +- inline NotSoSimpleVector (const NotSoSimpleVector &o) +- { +- this->arrayMain = NULL; +- this->numMain = o.numMain; +- this->numAllocMain = o.numAllocMain; +- resizeMain (); +- memcpy (this->arrayMain, o.arrayMain, sizeof (T) * numMain); +- +- this->arrayExtra = NULL; +- this->numExtra = o.numExtra; +- this->numAllocExtra = o.numAllocExtra; +- resizeExtra (); +- memcpy (this->arrayExtra, o.arrayExtra, sizeof (T) * numExtra); +- +- this->startExtra = o.startExtra; +- } +- + inline ~NotSoSimpleVector () + { + if (this->arrayMain) +--- dillo-3.0.5.orig/src/cache.c ++++ dillo-3.0.5/src/cache.c +@@ -1298,7 +1298,7 @@ static CacheEntry_t *Cache_process_queue + /* + * Callback function for Cache_delayed_process_queue. + */ +-static void Cache_delayed_process_queue_callback() ++static void Cache_delayed_process_queue_callback(void *ptr) + { + CacheEntry_t *entry; + +--- dillo-3.0.5.orig/src/jpeg.c ++++ dillo-3.0.5/src/jpeg.c +@@ -123,7 +123,7 @@ static void Jpeg_close(DilloJpeg *jpeg, + * static void init_source(j_decompress_ptr cinfo) + * (declaring it with no parameter avoids a compiler warning) + */ +-static void init_source() ++static void init_source(struct jpeg_decompress_struct *p) + { + } + +@@ -180,7 +180,7 @@ static void skip_input_data(j_decompress + * static void term_source(j_decompress_ptr cinfo) + * (declaring it with no parameter avoids a compiler warning) + */ +-static void term_source() ++static void term_source(struct jpeg_decompress_struct *p) + { + } + diff -Nru dillo-3.0.5/debian/patches/series dillo-3.0.5/debian/patches/series --- dillo-3.0.5/debian/patches/series 2024-08-07 02:27:21.000000000 +0300 +++ dillo-3.0.5/debian/patches/series 2025-10-04 22:56:32.000000000 +0300 @@ -5,3 +5,4 @@ fix-FTBFS-with-gcc-10.patch CFLAGS.diff fix-FTBFS-with-gcc-14.diff +gcc-15.patch
