[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/files/

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/files/

[Conrad Kostecki]

commit:     681f5ae97cce21487b459b625ab40be58faa3411
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 15 16:26:02 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 18:05:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=681f5ae9

lxde-base/lxpanel: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/20396
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/lxpanel-remove-gdk-pixbuf-xlib.patch     | 26 ----------------------
 1 file changed, 26 deletions(-)

diff --git a/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch b/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
deleted file mode 100644
index 7f52fb022e1..00000000000
--- a/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/753923
-
---- a/plugins/launchtaskbar.c	2019-01-13 16:35:07.000000000 -0500
-+++ b/plugins/launchtaskbar.c	2020-11-10 14:25:51.550180345 -0500
-@@ -69,5 +69,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <glib/gi18n.h>
---- a/plugins/task-button.c	2019-02-26 16:45:49.000000000 -0500
-+++ b/plugins/task-button.c	2020-11-10 14:25:44.858209009 -0500
-@@ -44,5 +44,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <glib/gi18n.h>
---- a/src/plugin.c	2019-01-13 16:35:07.000000000 -0500
-+++ b/src/plugin.c	2020-11-10 14:25:38.820234868 -0500
-@@ -30,5 +30,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <string.h>

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/files/

[Sam James]

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 <600723+raviksharma@users.noreply.github.com>
-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. */
-