user debian-rele...@lists.debian.org
usertags 1075259 + bsp-2025-04-brazil
tags 1075259 patch
thanks

On Wednesday, July 03 2024, Matthias Klose wrote:

> The package fails to build in a test rebuild on at least amd64 with
> gcc-14/g++-14, but succeeds to build with gcc-13/g++-13. The
> severity of this report will be raised before the trixie release.
>
> The full build log can be found at:
> http://qa-logs.debian.net/2024/07/01/mate-settings-daemon_1.26.1-1.1_unstable_gccexp.log
> The last lines of the build log are at the end of this report.

I fixed the two problems I found here, and the package now builds.

I saw that the package has been somewhat abandoned, so I'm going to
upload to the 2-day NMU queue.

Here's the debdiff just in case.

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/

diff -Nru mate-settings-daemon-1.26.1/debian/changelog mate-settings-daemon-1.26.1/debian/changelog
--- mate-settings-daemon-1.26.1/debian/changelog	2024-05-29 21:21:29.000000000 -0400
+++ mate-settings-daemon-1.26.1/debian/changelog	2025-04-05 18:09:25.000000000 -0400
@@ -1,3 +1,14 @@
+mate-settings-daemon (1.26.1-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 14
+    - d/p/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch:
+      Return FALSE from apply_intended_configuration.
+    - d/p/fix-ftbfs-gcc14.patch: Adjust on_key_press_event signature.
+    (Closes: #1075259)
+
+ -- Sergio Durigan Junior <sergi...@debian.org>  Sat, 05 Apr 2025 18:09:25 -0400
+
 mate-settings-daemon (1.26.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru mate-settings-daemon-1.26.1/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch mate-settings-daemon-1.26.1/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch
--- mate-settings-daemon-1.26.1/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch	2021-12-11 10:58:24.000000000 -0500
+++ mate-settings-daemon-1.26.1/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch	2025-04-05 18:01:52.000000000 -0400
@@ -79,7 +79,7 @@
  
 +#ifdef HAVE_RDA
 +	if (rda_session_is_remote()) {
-+		return;
++		return FALSE;
 +	}
 +#endif
 +
diff -Nru mate-settings-daemon-1.26.1/debian/patches/fix-ftbfs-gcc14.patch mate-settings-daemon-1.26.1/debian/patches/fix-ftbfs-gcc14.patch
--- mate-settings-daemon-1.26.1/debian/patches/fix-ftbfs-gcc14.patch	1969-12-31 19:00:00.000000000 -0500
+++ mate-settings-daemon-1.26.1/debian/patches/fix-ftbfs-gcc14.patch	2025-04-05 18:01:38.000000000 -0400
@@ -0,0 +1,21 @@
+Author: Sergio Durigan Junior <sergi...@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075259
+Forwarded: not-yet
+
+Description: atspi_device_listener_new's callback
+ (AtspiDeviceListenerCB) changed its signature, so we need to adjust
+ it here as well.
+
+Index: mate-settings-daemon-1.26.1/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c
+===================================================================
+--- mate-settings-daemon-1.26.1.orig/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c	2023-05-11 12:23:20.000000000 -0400
++++ mate-settings-daemon-1.26.1/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c	2025-04-05 17:48:07.478226432 -0400
+@@ -55,7 +55,7 @@
+ }
+ 
+ static gboolean
+-on_key_press_event (const AtspiDeviceEvent *event,
++on_key_press_event (AtspiDeviceEvent *event,
+                     void                   *user_data G_GNUC_UNUSED)
+ {
+         /* don't ring on capslock itself, that's taken care of by togglekeys
diff -Nru mate-settings-daemon-1.26.1/debian/patches/series mate-settings-daemon-1.26.1/debian/patches/series
--- mate-settings-daemon-1.26.1/debian/patches/series	2023-09-10 07:56:20.000000000 -0400
+++ mate-settings-daemon-1.26.1/debian/patches/series	2025-04-05 18:04:56.000000000 -0400
@@ -1,2 +1,3 @@
 1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch
 1002-debounce_multiple_rfkill_events.patch
+fix-ftbfs-gcc14.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to