Accepting request 1316987 from X11:Unity

OBS-URL: https://build.opensuse.org/request/show/1316987
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/notify-osd?expand=0&rev=29

notify-osd-fix-types.patch

@@ -0,0 +1,24 @@
+--- a/src/bubble-window.c
++++ b/src/bubble-window.c
+@@ -78,8 +78,8 @@ bubble_window_get_accessible (GtkWidget
+     {
+       AtkObjectFactory *factory = NULL;
+       AtkRegistry *registry = NULL;
+-      GType derived_type = NULL;
+-      GType derived_atk_type = NULL;
++      GType derived_type = G_TYPE_INVALID;
++      GType derived_atk_type = G_TYPE_INVALID;
+ 
+       /*
+        * Figure out whether accessibility is enabled by looking at the
+--- a/src/display.c
++++ b/src/display.c
+@@ -288,7 +288,7 @@ stack_layout (Stack* self)
+ 	gint       y      = 0;
+ 	gint       x      = 0;
+ 
+-	g_return_if_fail (self != NULL);
++	g_return_val_if_fail (self != NULL, TRUE);
+ 
+ 	bubble = stack_select_next_to_display (self);
+ 	if (bubble == NULL)

notify-osd-fix-voidreturn.patch

@@ -1,11 +0,0 @@
---- a/src/display.c
-+++ b/src/display.c
-@@ -288,7 +288,7 @@ stack_layout (Stack* self)
- 	gint       y      = 0;
- 	gint       x      = 0;
- 
--	g_return_if_fail (self != NULL);
-+	g_return_val_if_fail (self != NULL, TRUE);
- 
- 	bubble = stack_select_next_to_display (self);
- 	if (bubble == NULL)

notify-osd.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov  7 10:19:14 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fix build with GCC 15
+
+-------------------------------------------------------------------
+Sat Dec  7 19:59:30 UTC 2024 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Replace notify-osd-fix-voidreturn.patch with
+  notify-osd-fix-types.patch: Fix compilation error due to the use
+  of a null pointer with GType.
+
 -------------------------------------------------------------------
 Thu Feb 22 14:03:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

notify-osd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package notify-osd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,8 +26,8 @@ URL:            https://launchpad.net/notify-osd
 Source:         https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz
 # PATCH-FEATURE-OPENSUSE notify-osd-leolik.patch -- Extend the configuration capabilities, patch by Roman Sukochev (Leolik) from https://launchpad.net/~leolik/+archive/leolik.
 Patch0:         %{name}-leolik.patch
-# PATCH-FIX-UPSTREAM notify-osd-fix-voidreturn.patch sor.alexei@meowr.ru -- Fix value non-return in display.c stack_layout().
-Patch1:         %{name}-fix-voidreturn.patch
+# PATCH-FIX-UPSTREAM notify-osd-fix-types.patch sor.alexei@meowr.ru -- Fix type errors.
+Patch1:         %{name}-fix-types.patch
 # PATCH-FIX-UPSTREAM notify-osd-fix-workarea.patch sor.alexei@meowr.ru -- Fix workarea on GTK+ 3.22.[0-21].
 Patch2:         %{name}-fix-workarea.patch
 BuildRequires:  autoconf >= 2.59
@@ -63,6 +63,9 @@ and timeouts.
 cp %{_datadir}/automake*/COPYING .
 
 %build
+%if %{pkg_vcmp gcc >= 15}
+export CFLAGS="%{optflags} -std=gnu17"
+%endif
 NOCONFIGURE=1 gnome-autogen.sh
 %configure \
   --disable-schemas-compile