* [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/, lxde-base/lxpanel/files/
@ 2018-01-25 22:42 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2018-01-25 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 943cc9886867841175e738001811eef1d3e827ca
Author: charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Sat Jan 20 16:43:29 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 22:42:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943cc988
lxde-base/lxpanel: remove old.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6915
lxde-base/lxpanel/Manifest | 1 -
.../lxpanel/files/lxpanel-0.5.9-sandbox.patch | 29 ---------
.../files/lxpanel-0.7.0-right-click-fix.patch | 25 --------
lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild | 73 ----------------------
4 files changed, 128 deletions(-)
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 525a780960e..e7a9ded64db 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,4 +1,3 @@
-DIST lxpanel-0.7.0.tar.xz 1479456 BLAKE2B 258fb80c5539ff408f0e54a817675f8202fb09f5a4096138a9a5ec58206022e4cc653a6463ca7b1be471dad7e38d8601bbd23aaafad35d993a8929e514a40edb SHA512 396147a24e852dd7288f99281116c797df4dbb1912925a6b4403ffe74bb8e3d821f7cd96965bedb2db9aff2d1ca3ae89be6e5712df04353a69a9cca5b03589aa
DIST lxpanel-0.8.1.tar.xz 1485612 BLAKE2B 0c53be0610300f1edf4e9a2e014e0d299889100dc97f097c909e20484a7d2ed2b9e74dc118443ce110d58cef1f0ea0db44a25dc15de717d09774bddd9556b04d SHA512 cebad5e9399618adcc47ad0f2542bd57ce6cd707d65e9f1f67e2a435607e91e948c14102eb5534bb8d60a964277ef98658ec8d7a0109121a4b4f6067b385e39d
DIST lxpanel-0.8.2.tar.xz 1488548 BLAKE2B 9ded67a0aba220c2f5683e66371a2d3a5362c400dfb2827546682f86be1e4817545b0139e8b9ffdb5d17615e2e5209ba2258dc199b39249135cbd31598d9ba55 SHA512 abab9175c4a4e591a33c39fbc41754e458eea60c79f5a40d56848338b910a867bafed09b4d1f2596a588beb79bfb5efe54c798ff5f7b0ee74f6245a1b0417918
DIST lxpanel-0.9.2.tar.xz 1514748 BLAKE2B 31b0f949b7023364df3eb00b2386c505e14146c2b818407326347baf1dfa09b3e2e0c30c38416430c7dccad04f1fd5731a6ff80b21ea87a930492399027a056f SHA512 d7b5733345233a44466b6786133b8c3f3c9217a5195654b8dde3447a0dfc198082d991b2bc0cc60ddf200ebb95d636885b36d5642c11f4cd913f66228c12bd3a
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch b/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
deleted file mode 100644
index 0f40c185bc6..00000000000
--- a/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: lxpanel-0.5.9/src/plugins/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/Makefile.am
-@@ -49,6 +49,3 @@ EXTRA_DIST = \
- icon.xpm
-
- install-exec-hook:
-- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.la
-- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.a
-- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.
-Index: lxpanel-0.5.9/src/plugins/netstat/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/netstat/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/netstat/Makefile.am
-@@ -33,4 +33,3 @@ netstat_la_LDFLAGS = \
- @LXPANEL_MODULE@
-
- install-exec-hook:
-- rm -f "$(moduledir)\*.la" *.a
-Index: lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
-===================================================================
---- lxpanel-0.5.9.orig/src/plugins/netstatus/Makefile.am
-+++ lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
-@@ -34,4 +34,3 @@ netstatus_la_LDFLAGS = \
- $(LXPANEL_MODULE)
-
- install-exec-hook:
-- rm -f "$(moduledir)\*.la" *.a
diff --git a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
deleted file mode 100644
index f6325b6f8c3..00000000000
--- a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4943c80cded6325284be8b58003fe63dd6e8255 Mon Sep 17 00:00:00 2001
-From: Raimar <no@email.de>
-Date: Thu, 21 Aug 2014 23:21:28 +0200
-Subject: [PATCH 1/1] fix crash after click on empty part of panel
-
----
- src/panel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/panel.c b/src/panel.c
-index 6b2ede6..87903d8 100644
---- a/src/panel.c
-+++ b/src/panel.c
-@@ -233,7 +233,7 @@ static gboolean lxpanel_button_press(GtkWidget *widget, GdkEventButton *event)
- gtk_menu_popup(popup, NULL, NULL, NULL, NULL, event->button, event->time);
- return TRUE;
- }
-- return GTK_WIDGET_CLASS(lxpanel_parent_class)->button_press_event(widget, event);
-+ return FALSE;
- }
-
- static void lxpanel_class_init(PanelToplevelClass *klass)
---
-1.7.10.4
-
diff --git a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
deleted file mode 100644
index d6f1bf10262..00000000000
--- a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils readme.gentoo versionator
-
-MAJOR_VER="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${MAJOR_VER}.x/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa wifi"
-RESTRICT="test" # bug 249598
-
-RDEPEND="x11-libs/gtk+:2
- >=x11-libs/libfm-1.2.0[gtk]
- x11-libs/libwnck:1
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/libX11
- lxde-base/lxmenu-data
- lxde-base/menu-cache
- alsa? ( media-libs/alsa-lib )
- wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-src_prepare() {
- #bug #522404
- epatch "${FILESDIR}"/${PN}-0.7.0-right-click-fix.patch
- epatch "${FILESDIR}"/${PN}-0.5.9-sandbox.patch
- #bug #415595
- sed -i "s:-Werror::" configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local plugins="netstatus,volume,cpu,deskno,batt, \
- kbled,xkb,thermal,cpufreq,monitors"
-
- use wifi && plugins+=",netstat"
- use alsa && plugins+=",volumealsa"
- [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
- econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
- # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install () {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-
- # Get rid of the .la files.
- find "${D}" -name '*.la' -delete
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/, lxde-base/lxpanel/files/
@ 2024-07-28 4:14 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-07-28 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 5102b52b95c861c2087a93445713a4dc8bb0f4c5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:13:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:13:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5102b52b
lxde-base/lxpanel: fix modern C issues, fix applet icon
Closes: https://bugs.gentoo.org/919092
Signed-off-by: Sam James <sam <AT> gentoo.org>
lxde-base/lxpanel/files/lxpanel-0.10.1-c99-2.patch | 25 +++++++
lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch | 29 ++++++++
.../files/lxpanel-0.10.1-netstatus-icon.patch | 79 ++++++++++++++++++++++
lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild | 73 ++++++++++++++++++++
4 files changed, 206 insertions(+)
diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-c99-2.patch b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99-2.patch
new file mode 100644
index 000000000000..e4d674a3fd10
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99-2.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/919092
+https://github.com/lxde/lxpanel/commit/633a2d46ffd37f3acde539de9a2861d1ade49ef8
+
+From 633a2d46ffd37f3acde539de9a2861d1ade49ef8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@oddnet.de>
+Date: Mon, 18 Sep 2023 13:59:08 +0200
+Subject: [PATCH] Fix warning that argument is of incompatible pointer type
+
+Cast the netstatus icon appropriately.
+---
+ plugins/netstatus/netstatus-dialog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/netstatus/netstatus-dialog.c b/plugins/netstatus/netstatus-dialog.c
+index f982b1ed..c4e3e8c1 100644
+--- a/plugins/netstatus/netstatus-dialog.c
++++ b/plugins/netstatus/netstatus-dialog.c
+@@ -880,5 +880,5 @@ void netstatus_dialog_present (GtkWidget *dialog)
+
+ data = g_object_get_data(G_OBJECT(dialog), "netstatus-dialog-data");
+ gtk_window_present(GTK_WINDOW(dialog));
+- gtk_widget_show(data->icon);
++ gtk_widget_show(GTK_WIDGET(data->icon));
+ }
+
diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch
new file mode 100644
index 000000000000..06a94821079d
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/919092
+https://github.com/lxde/lxpanel/pull/70
+
+From 914bcc3945503be2506e112883a648b867c6db57 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
+
+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
+--- a/plugins/tray.c
++++ b/plugins/tray.c
+@@ -631,7 +631,7 @@ static GtkWidget *tray_constructor(LXPanel *panel, config_setting_t *settings)
+ /* Add GDK event filter. */
+ 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_window = GDK_WINDOW_XID(gtk_widget_get_window(invisible));
+
+ /* Allocate top level widget and set into Plugin widget pointer. */
+
diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-netstatus-icon.patch b/lxde-base/lxpanel/files/lxpanel-0.10.1-netstatus-icon.patch
new file mode 100644
index 000000000000..69d78e26e9cb
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-netstatus-icon.patch
@@ -0,0 +1,79 @@
+https://github.com/lxde/lxpanel/commit/6eebb78d2cb87276334641965793a8feebc952ab
+
+From 6eebb78d2cb87276334641965793a8feebc952ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
+Date: Fri, 6 Nov 2020 05:56:08 +0100
+Subject: [PATCH] Show the dialog icon after the window has been presented
+
+This fixes a bug that sometimes made the icon not appear where
+it was supposed to, but in the upper left corner of the dialog
+above the tab.
+--- a/plugins/netstatus/netstatus-dialog.c
++++ b/plugins/netstatus/netstatus-dialog.c
+@@ -1,6 +1,7 @@
+ /*
+ * Copyright (C) 2003 Sun Microsystems, Inc.
+ * Copyright (C) 2004 Red Hat Inc.
++ * Copyright (C) 2020 Ingo Brückl
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+@@ -629,7 +630,6 @@ netstatus_dialog_setup_connection (NetstatusDialogData *data)
+ netstatus_icon_set_tooltips_enabled (NETSTATUS_ICON (icon), FALSE);
+ netstatus_icon_set_show_signal (NETSTATUS_ICON (icon), FALSE);
+ gtk_box_pack_end (GTK_BOX (hbox), icon, FALSE, TRUE, 4);
+- gtk_widget_show (icon);
+
+ data->icon = NETSTATUS_ICON (icon);
+
+@@ -873,3 +873,12 @@ const char* netstatus_dialog_get_iface_name( GtkWidget* dialog )
+ data = g_object_get_data (G_OBJECT (dialog), "netstatus-dialog-data");
+ return netstatus_iface_get_name (data->iface);
+ }
++
++void netstatus_dialog_present (GtkWidget *dialog)
++{
++ NetstatusDialogData *data;
++
++ data = g_object_get_data(G_OBJECT(dialog), "netstatus-dialog-data");
++ gtk_window_present(GTK_WINDOW(dialog));
++ gtk_widget_show(data->icon);
++}
+--- a/plugins/netstatus/netstatus-dialog.h
++++ b/plugins/netstatus/netstatus-dialog.h
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (C) 2003 Sun Microsystems, Inc.
++ * Copyright (C) 2020 Ingo Brückl
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+@@ -38,6 +39,8 @@ const char* netstatus_dialog_get_configuration_tool( GtkWidget* dialog );
+ /* 2009.05.10 Add by Hong Jen Yee (PCMan) to be used in lxpanel plugin */
+ const char* netstatus_dialog_get_iface_name( GtkWidget* dialog );
+
++void netstatus_dialog_present(GtkWidget *dialog);
++
+ G_END_DECLS
+
+ #endif /* __NETSTATUS_DIALOG_H__ */
+--- a/plugins/netstatus/netstatus.c
++++ b/plugins/netstatus/netstatus.c
+@@ -3,6 +3,7 @@
+ * 2008 Fred Chien <fred@lxde.org>
+ * 2009 martyj19 <martyj19@comcast.net>
+ * 2014 Andriy Grytsenko <andrej@rep.kiev.ua>
++ * 2020 Ingo Brückl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -99,7 +100,7 @@ static gboolean on_button_press( GtkWidget* widget, GdkEventButton* evt, LXPanel
+ netstatus_dialog_set_configuration_tool( ns->dlg, ns->config_tool );
+ g_signal_connect( ns->dlg, "response", G_CALLBACK(on_response), ns );
+ }
+- gtk_window_present( GTK_WINDOW(ns->dlg) );
++ netstatus_dialog_present(ns->dlg);
+ }
+ return TRUE;
+ }
+
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..bfc8f51507bc
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 xdg
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
+SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa wifi"
+
+RDEPEND="
+ dev-libs/keybinder:3
+ lxde-base/lxmenu-data
+ >=lxde-base/menu-cache-1.1.0-r1
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ >=x11-libs/libfm-1.3.2[gtk]
+ x11-libs/libwnck:3
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXpm
+ alsa? ( media-libs/alsa-lib )
+ wifi? ( net-wireless/wireless-tools )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+PATCHES=(
+ # https://sourceforge.net/p/lxde/bugs/773/
+ "${FILESDIR}/${P}-fix-pager-panel-width.patch"
+ "${FILESDIR}/${PN}-0.10.1-netstatus-icon.patch"
+ "${FILESDIR}/${PN}-0.10.1-c99.patch"
+ "${FILESDIR}/${PN}-0.10.1-c99-2.patch"
+)
+
+src_configure() {
+ local plugins="netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors"
+
+ use wifi && plugins+=",netstat"
+ use alsa && plugins+=",volumealsa"
+
+ econf \
+ $(use_enable alsa) \
+ --enable-gtk3 \
+ --with-x \
+ --with-plugins="${plugins}"
+ # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-28 4:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-28 4:14 [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxpanel/, lxde-base/lxpanel/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-01-25 22:42 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox