Control: tags 1097530 + patch
Control: tags 1097530 + pending

Dear maintainer,

I've prepared an NMU for osmo (versioned as 0.4.4-2.2) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for osmo-0.4.4 osmo-0.4.4

 changelog            |    7 +++++++
 patches/gcc-15.patch |   26 ++++++++++++++++++++++++++
 patches/series       |    1 +
 3 files changed, 34 insertions(+)

diff -Nru osmo-0.4.4/debian/changelog osmo-0.4.4/debian/changelog
--- osmo-0.4.4/debian/changelog	2024-01-23 22:15:30.000000000 +0200
+++ osmo-0.4.4/debian/changelog	2025-10-22 20:06:42.000000000 +0300
@@ -1,3 +1,10 @@
+osmo (0.4.4-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 15. (Closes: #1097530)
+
+ -- Adrian Bunk <[email protected]>  Wed, 22 Oct 2025 20:06:42 +0300
+
 osmo (0.4.4-2.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru osmo-0.4.4/debian/patches/gcc-15.patch osmo-0.4.4/debian/patches/gcc-15.patch
--- osmo-0.4.4/debian/patches/gcc-15.patch	1970-01-01 02:00:00.000000000 +0200
+++ osmo-0.4.4/debian/patches/gcc-15.patch	2025-10-22 20:06:42.000000000 +0300
@@ -0,0 +1,26 @@
+Description: Fix FTBFS with GCC 15
+Author: Adrian Bunk <[email protected]>
+Bug-Debian: https://bugs.debian.org/1097530
+
+--- osmo-0.4.4.orig/src/calendar_notes.c
++++ osmo-0.4.4/src/calendar_notes.c
+@@ -67,7 +67,7 @@ cal_check_notes (guint32 julian_start, g
+ /*------------------------------------------------------------------------------*/
+ 
+ void
+-cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(), GUI *appGUI)
++cal_notes_foreach (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(struct note *n, GUI *appGUI), GUI *appGUI)
+ {
+ 	GSList *node;
+ 	struct note *n;
+--- osmo-0.4.4.orig/src/calendar_notes.h
++++ osmo-0.4.4/src/calendar_notes.h
+@@ -53,7 +53,7 @@ enum {
+ 
+ gboolean    cal_check_note              (guint32 julian, GUI *appGUI);
+ gboolean    cal_check_notes             (guint32 julian_start, guint32 julian_end, GUI *appGUI);
+-void        cal_notes_foreach           (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(), GUI *appGUI);
++void        cal_notes_foreach           (guint32 julian_start, guint32 julian_end, gboolean (*cnfunc)(struct note *n, GUI *appGUI), GUI *appGUI);
+ gchar *     cal_get_note                (guint32 julian, GUI *appGUI);
+ gchar *     cal_get_note_color          (guint32 julian, GUI *appGUI);
+ void        cal_replace_note_color      (gchar *old_color, gchar *new_color, GUI *appGUI);
diff -Nru osmo-0.4.4/debian/patches/series osmo-0.4.4/debian/patches/series
--- osmo-0.4.4/debian/patches/series	2024-01-23 22:15:30.000000000 +0200
+++ osmo-0.4.4/debian/patches/series	2025-10-22 20:06:42.000000000 +0300
@@ -1,2 +1,3 @@
 libxml2.patch
 webkit4.1.patch
+gcc-15.patch

Reply via email to