Bug#1086472: NMU: marco FTBFS on 32-bit with 64-bit time_t with gcc 14
Control: tags -1 patch
Please find a workaround attached that will last on armel/armhf
until Y2K38 happens.
diff -Nru marco-1.26.2/debian/changelog marco-1.26.2/debian/changelog
--- marco-1.26.2/debian/changelog 2023-08-19 22:36:05.000000000 +0200
+++ marco-1.26.2/debian/changelog 2025-03-12 19:41:34.000000000 +0100
@@ -1,3 +1,10 @@
+marco (1.26.2-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use Y2K38-unsafe startup-notification API. (Closes: #1086472)
+
+ -- Bastian Germann <bage@debian.org> Wed, 12 Mar 2025 20:00:03 +0100
+
marco (1.26.2-4) unstable; urgency=medium
* debian/:
diff -Nru marco-1.26.2/debian/patches/2000_use-y2k38-unsafe-startup-notification-api.patch marco-1.26.2/debian/patches/2000_use-y2k38-unsafe-startup-notification-api.patch
--- marco-1.26.2/debian/patches/2000_use-y2k38-unsafe-startup-notification-api.patch 1970-01-01 01:00:00.000000000 +0100
+++ marco-1.26.2/debian/patches/2000_use-y2k38-unsafe-startup-notification-api.patch 2025-03-12 19:38:24.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Use Y2K38-unsafe startup-notification API
+ sn_startup_sequence_get_last_active_time has a long where time_t should have
+ been the right choice. This patch should be dropped as soon as Debian pkg
+ startup-notification has moved on to contain an upstream fix.
+Author: Bastian Germann
+Bug: https://gitlab.freedesktop.org/xdg/startup-notification/-/issues/6
+Bug-Debian: https://bugs.debian.org/1086472
+---
+--- marco-1.26.2.orig/src/core/screen.c
++++ marco-1.26.2/src/core/screen.c
+@@ -2666,7 +2666,7 @@ collect_timed_out_foreach (void *element
+ SnStartupSequence *sequence = element;
+ double elapsed;
+
+- time_t tv_sec;
++ long tv_sec;
+ suseconds_t tv_usec;
+ gint64 tv;
+
diff -Nru marco-1.26.2/debian/patches/series marco-1.26.2/debian/patches/series
--- marco-1.26.2/debian/patches/series 2023-08-19 22:21:42.000000000 +0200
+++ marco-1.26.2/debian/patches/series 2025-03-12 19:40:39.000000000 +0100
@@ -2,3 +2,4 @@
1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch
0001_check-availability-of-compositing-1.patch
0002_check-availability-of-compositing-2.patch
+2000_use-y2k38-unsafe-startup-notification-api.patch
Reply to: