user [email protected] usertags 1096326 + bsp-2025-10-brazil tags 1096326 + patch thanks
On Monday, February 17 2025, Matthias Klose wrote: > The package fails to build in a test rebuild on at least amd64 with > gcc-15/g++-15, but succeeds to build with gcc-14/g++-14. The > severity of this report will be raised before the forky release. > > The full build log can be found at: > http://qa-logs.debian.net/2025/02/16/amd64exp/argyll_3.1.0+repack-1.1_unstable_gccexp.log.gz > The last lines of the build log are at the end of this report. Hello, I've fixed the problem and uploaded an NMU to DELAYED-5. I'm also attaching the patch to this bug just in case. Feel free to cancel the upload if you'd like. Otherwise, this bug will be closed in 5 days. Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible https://sergiodj.net/
From 8cf4f52d605c6142b1b3c24a2c75d6783d174f4e Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior <[email protected]> Date: Sat, 18 Oct 2025 22:54:17 -0400 Subject: [PATCH] d/p/0130_gcc15.patch: Fix FTBFS with GCC 15. Closes: #1096326 --- debian/patches/0130_gcc15.patch | 60 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 61 insertions(+) create mode 100644 debian/patches/0130_gcc15.patch diff --git a/debian/patches/0130_gcc15.patch b/debian/patches/0130_gcc15.patch new file mode 100644 index 0000000..31514c5 --- /dev/null +++ b/debian/patches/0130_gcc15.patch @@ -0,0 +1,60 @@ +Author: Sergio Durigan Junior <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1096326 +Forwarded: not-needed +Description: Fix FTBFS with GCC 15. + Upstream's newest release (3.4.1) already contains these fixes, but + unfortunately they don't seem to use a public versioning system and + it's not possible to find backportable patches. + +Index: argyll-3.3.0+repack/numlib/dnsq.c +=================================================================== +--- argyll-3.3.0+repack.orig/numlib/dnsq.c 2024-09-24 18:29:10.000000000 -0400 ++++ argyll-3.3.0+repack/numlib/dnsq.c 2025-10-18 22:43:39.244252339 -0400 +@@ -15,7 +15,7 @@ + + #undef DEBUG + +-typedef long int bool; ++typedef long int abool; + #ifndef TRUE + # define FALSE (0) + # define TRUE (!FALSE) +@@ -41,7 +41,7 @@ + + /* QR factorization */ + static int dqrfac(int m, int n, double *a, int lda, +- bool pivot, int *ipvt, double *sigma, ++ abool pivot, int *ipvt, double *sigma, + double *acnorm, double *wa); + + /* Use QR decomposition to form the orthogonal matrix */ +@@ -491,7 +491,7 @@ + int iwa[1]; /* Pivot swap array (only one element used) */ + + /* Local variables */ +- bool jeval; ++ abool jeval; + int iter; + int i, j, k, l, iflag; + int qrflag; /* Set when a valid Q is in fjac[], and R is in r[] */ +@@ -1583,7 +1583,7 @@ + int n, /* Number of columns of a[] */ + double *a, /* m by n array */ + int lda, /* stride of a[][] */ +- bool pivot, /* TRUE to enforce column pivoting */ ++ abool pivot, /* TRUE to enforce column pivoting */ + int *ipvt, /* Pivot output array, size n */ + double *sigma, /* Output diagonal elements of R, length n */ + double *acnorm, /* Output norms of A, length n */ +Index: argyll-3.3.0+repack/rspl/c1df.c +=================================================================== +--- argyll-3.3.0+repack.orig/rspl/c1df.c 2024-09-24 18:29:15.000000000 -0400 ++++ argyll-3.3.0+repack/rspl/c1df.c 2025-10-18 22:48:59.247272517 -0400 +@@ -34,7 +34,6 @@ + #include "plot.h" + #include "ui.h" + +-double lin(); + void usage(void); + + #define TRIALS 15 /* Number of random trials */ diff --git a/debian/patches/series b/debian/patches/series index 2b62e9b..b2508c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ #0120_kfreebsd.patch 0125_gcc5.patch #999_GCC-10-fix.patch +0130_gcc15.patch -- 2.50.1
signature.asc
Description: PGP signature
