commit:     b0cba17b20830ae4ca4755fabd563b9b9277bcd4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 02:33:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 02:33:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0cba17b

lxde-base/lxpanel: update C99 patch

It's functionally the same but it incorporates some feedback I gave which
was later applied in the PR upstream.

Bug: https://bugs.gentoo.org/919092
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch 
b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch
index 06a94821079d..b7a50f6860ab 100644
--- a/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch
@@ -1,20 +1,13 @@
 https://bugs.gentoo.org/919092
-https://github.com/lxde/lxpanel/pull/70
+https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
 
-From 914bcc3945503be2506e112883a648b867c6db57 Mon Sep 17 00:00:00 2001
+From 0853b0fc981285ebd2ac52f8dfc2a09b1090748c Mon Sep 17 00:00:00 2001
 From: Ravi Kant Sharma <[email protected]>
-Date: Tue, 23 Jul 2024 18:02:44 +0200
-Subject: [PATCH] fix build failure on gcc-14
+Date: Tue, 30 Jul 2024 17:52:07 +0200
+Subject: [PATCH] Fix gcc-14 build error
 
-gcc-14 treats implicitly casting all pointer types to all other pointer types 
as error now.
-
-https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors
----
- plugins/tray.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/tray.c b/plugins/tray.c
-index 3e66b81f..42d4917c 100644
+gcc-14 now treats a conversion between pointers of incompatible types
+as an error.
 --- a/plugins/tray.c
 +++ b/plugins/tray.c
 @@ -631,7 +631,7 @@ static GtkWidget *tray_constructor(LXPanel *panel, 
config_setting_t *settings)
@@ -22,8 +15,7 @@ index 3e66b81f..42d4917c 100644
      gdk_window_add_filter(NULL, (GdkFilterFunc) tray_event_filter, tr);
      /* Reference the window since it is never added to a container. */
 -    tr->invisible = g_object_ref_sink(G_OBJECT(invisible));
-+    tr->invisible = (GtkWidget *) g_object_ref_sink(G_OBJECT(invisible));
++    tr->invisible = GTK_WIDGET(g_object_ref_sink(G_OBJECT(invisible)));
      tr->invisible_window = GDK_WINDOW_XID(gtk_widget_get_window(invisible));
  
      /* Allocate top level widget and set into Plugin widget pointer. */
-

Reply via email to