Control: tag -1 +patch On Sat Sep 6, 2025 at 2:41 PM CEST, Diederik de Haas via Pkg-voip-maintainers wrote: > Control: tag -1 +upstream +fixed-upstream > Control: forwarded -1 https://github.com/mumble-voip/mumble/pull/6775 > > On Fri Sep 5, 2025 at 8:20 PM CEST, Santiago Vila wrote: >> Package: src:mumble >> Version: 1.5.735-5 >> Severity: serious >> Tags: ftbfs forky sid >> >> During a rebuild of all packages in unstable, your package failed to build. > > As usual, upstream also made a backport-to-1.5.x PR: > https://github.com/mumble-voip/mumble/pull/6778
Please find attached PR6778 but ready for the Debian package. https://salsa.debian.org/diederik/mumble/-/pipelines/931004 shows that it builds successfully. The autopkgtest issues seem related to Debian infrastructure, not to this patch. Cheers, Diederik
From 943f02b70c564acec5ff886aea8a7708af7fccbf Mon Sep 17 00:00:00 2001 From: Diederik de Haas <[email protected]> Date: Sat, 6 Sep 2025 15:04:42 +0200 Subject: [PATCH] debian/patches: Add patch to fix building with GCC-15 Add the upstream commit added to the 1.5.x branch as patch to debian/patches to fix building with GCC-15. Closes: #1114216 Link: https://bugs.debian.org/1114216 Link: https://github.com/mumble-voip/mumble/pull/6775 Link: https://github.com/mumble-voip/mumble/pull/6778 Signed-off-by: Diederik de Haas <[email protected]> --- ...ILD-overlay-Fix-building-with-GCC-15.patch | 40 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/91-BUILD-overlay-Fix-building-with-GCC-15.patch diff --git a/debian/patches/91-BUILD-overlay-Fix-building-with-GCC-15.patch b/debian/patches/91-BUILD-overlay-Fix-building-with-GCC-15.patch new file mode 100644 index 0000000..d4244f5 --- /dev/null +++ b/debian/patches/91-BUILD-overlay-Fix-building-with-GCC-15.patch @@ -0,0 +1,40 @@ +From: Carl George <[email protected]> +Date: Tue, 8 Apr 2025 23:25:52 -0500 +Subject: BUILD(overlay): Fix building with GCC 15 +Origin: https://github.com/mumble-voip/mumble/commit/16ad07d980518a0fdca7b4a6e5dfc6a41ea0d8da + +C23 added the bool keyword, which results in an error if you try to +define an identifier named bool and then build with GCC 15. We can use +stdbool.h to define bool instead. + +https://gcc.gnu.org/gcc-15/porting_to.html#c23-new-keywords +(cherry picked from commit f4259722553335d79e9d28948ab7bdb00293a5ec) +--- + overlay_gl/overlay.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/overlay_gl/overlay.c b/overlay_gl/overlay.c +index de36c85b3..fd2c83605 100644 +--- a/overlay_gl/overlay.c ++++ b/overlay_gl/overlay.c +@@ -14,6 +14,7 @@ + #include <pwd.h> + #include <semaphore.h> + #include <stdarg.h> ++#include <stdbool.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -37,9 +38,6 @@ + + # include <link.h> + +-typedef unsigned char bool; +-# define true 1 +-# define false 0 + #elif defined(TARGET_MAC) + # include <AGL/agl.h> + # include <Carbon/Carbon.h> +-- +2.51.0 + diff --git a/debian/patches/series b/debian/patches/series index c444512..feaad5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 45-add-pid-location-hint.diff 50-fix-segfault-missing-pipewire-config.diff 90-debianize-systemd-unit.diff +91-BUILD-overlay-Fix-building-with-GCC-15.patch -- 2.51.0
signature.asc
Description: PGP signature
