Merge ~danilogondolfo/ubuntu/+source/beep:fix_ftbfs into ubuntu/+source/beep:ubuntu/devel

[Danilo Egea Gondolfo]

It FTBFS due to the redefinition of _FORTIFY_SOURCE as it already comes from dpkg-buildflags:

<command-line>: error: "_FORTIFY_SOURCE" redefined [-Werror]
<command-line>: note: this is the location of the previous definition
cc1: all warnings being treated as errors
make[2]: *** [GNUmakefile:242: beep-log.gcc-o] Error 1

[Lena Voytek (lvoytek)]

This patch looks good to me, and I can confirm this fixes the build. I'll go ahead and sponsor it.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c086313..4512390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+beep (1.4.9-1.1ubuntu1) noble; urgency=medium
+
+  * debian/patches/dont_redefine_FORTIFY_SOURCE.patch (LP: #2055689):
+    _FORTIFY_SOURCE is already defined from dpkg-buildflags and is causing a
+    FTBFS due to redefinition.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Fri, 01 Mar 2024 12:55:39 +0000
+
 beep (1.4.9-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 5bb1c54..2145a6d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: beep
 Section: sound
 Priority: optional
-Maintainer: Rhonda D'Vine <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Rhonda D'Vine <[e-mail]>
 Build-Depends: debhelper-compat (= 13), pkgconf, systemd-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/spkr-beep/beep
diff --git a/debian/patches/dont_redefine_FORTIFY_SOURCE.patch b/debian/patches/dont_redefine_FORTIFY_SOURCE.patch
 new file mode 100644
index 0000000..f803f43
--- /dev/null
+++ b/debian/patches/dont_redefine_FORTIFY_SOURCE.patch
@@ -0,0 +1,24 @@
+From: Danilo Egea Gondolfo <[e-mail]>
+Date: Fri, 1 Mar 2024 12:46:50 +0000
+Subject: Don't define _FORTIFY_SOURCE as it's already defined by
+ dpkg-buildflags.
+
+The build is failing with 'error: "_FORTIFY_SOURCE" redefined'.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/beep/+bug/2055689
+---
+ GNUmakefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index cef7b7b..31f60ab 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -103,7 +103,6 @@ CFLAGS_gcc += -std=gnu99 -pedantic
+ CFLAGS_gcc += -O -g
+ CFLAGS_gcc += -Wa,-adhlns=$(@:-o=-lst)
+ $(eval $(call CHECK_CFLAGS_gcc,-Wall -Wextra -Werror -Werror=format-security))
+-$(eval $(call CHECK_CFLAGS_gcc,-Wp$$(comma)-D_FORTIFY_SOURCE=2))
+ $(eval $(call CHECK_CFLAGS_gcc,-Wp$$(comma)-D_GLIBCXX_ASSERTIONS))
+ $(eval $(call CHECK_CFLAGS_gcc,-fasynchronous-unwind-tables))
+ $(eval $(call CHECK_CFLAGS_gcc,-fstack-protector-strong))
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..624e772
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont_redefine_FORTIFY_SOURCE.patch