diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-08-07 12:37:21 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-07 12:37:21 +0100 |
commit | b8c7370a682e4e29cda623222d17a790c01c3642 (patch) | |
tree | f6caa14689bd00a5760eadaa381ff41e50ef3c1b /lxde-base/lxpanel | |
parent | 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff) |
gentoo auto-resync : 07:08:2024 - 12:37:20
Diffstat (limited to 'lxde-base/lxpanel')
-rw-r--r-- | lxde-base/lxpanel/Manifest | 4 | ||||
-rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.10.1-c99-2.patch | 25 | ||||
-rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.10.1-c99.patch | 29 | ||||
-rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.10.1-netstatus-icon.patch | 79 | ||||
-rw-r--r-- | lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild | 75 |
5 files changed, 212 insertions, 0 deletions
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest index 240b38821967..6ecc5a1f5046 100644 --- a/lxde-base/lxpanel/Manifest +++ b/lxde-base/lxpanel/Manifest @@ -1,4 +1,8 @@ +AUX lxpanel-0.10.1-c99-2.patch 967 BLAKE2B e1d8d8186345a248fbaf7381c180a21bc55013437641826abf9455e2ee735ac6170e0658716cbf2be32f53eb94f08ef8c7cde502d324813236f5463c6f595af0 SHA512 5386166bf8d065cb5b3c60f56d33d5719bfd7b11bcc29808e6ae8543e552aac89d51adcd7d30dfdcaca961fb81fb8ea15d72354ead44adb22c1277b3b55a33be +AUX lxpanel-0.10.1-c99.patch 1212 BLAKE2B 15ecfef2bda6a4a3727dcc3d3b36f8c4fc725a9fe998ebe952547d3d1429b345840a2c233df730cc01b30b6ec56b33e45050ba66126847f3e2d4b12913ac2645 SHA512 e249f08009d0830b34eb29b9aff3740ef2e687c3a294972dd160b3100110bbfb00aa39f94ea867c4674c0c8b8979eddbf68f4dd40d19b75639365944dfbc50f1 AUX lxpanel-0.10.1-fix-pager-panel-width.patch 1123 BLAKE2B cc4e0063e92b0cad0a9477635dff3f013aee4e71626b61c5f5a1e45d5c1bc374c47eb5448cf69086215b8c1a1a901cd78629acdd5d2b1a065ca3cb8853a7e792 SHA512 ffd529b5facb9394cc5ab6501688aa20e32a74da198e6e7004325dd9fa6ca0ee01697d17913ba1115aa7a4267cfcaac855deb8b7a8e98a6de5b330e39efaeabf +AUX lxpanel-0.10.1-netstatus-icon.patch 3143 BLAKE2B 313dad88fa05da3bcb6f5595f044fdb20c939cba6c885216268e54da97de7f7d81637e777852959cec4d532d53e3b23dce7f67d9c70dbd656e76b1bac305269d SHA512 757b6ece571678c39a729908a776d5b5bf7eb6e06def797ee601d21d57881c71a5d28fef729258fa406664ab1b79bcdb162f81becd15e34cd438fbfbc58cf274 DIST lxpanel-0.10.1.tar.xz 1548276 BLAKE2B 2ea8628c9c4c7a77d65e58cae0b5656209db63b455299fcda00fe79aae1b139860ed8993ade7db68bbc65f61b8911f40879f1ef9993dc12f15f7480d3ea72cfa SHA512 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef +EBUILD lxpanel-0.10.1-r1.ebuild 1747 BLAKE2B 964fa0ff9c6ef205eb087acee531b5c9f9c9ca99c4cd5f3030b306ad3eaad4802b6c06543ba493cb33b3fd9d5eae6547e348319b7623060a1ab2dab35ba5c49d SHA512 635f9f5fed5a3a0c1d34ea4354fc9050fa8b9630b5eb57fd0a8f9ccf230ca4e7895e0639283f45d108348d88a038f406f90f52cb4eaa237225f5f67ec09189ce EBUILD lxpanel-0.10.1.ebuild 1596 BLAKE2B 157dfb6846933f7f39fb64f35ea7a4e68b1051db16277410653d7e47dbd1fb1d97a691eac7174b40372e137af3dab5582e879879408c402b563b739bae989b32 SHA512 71f5da0cfee2ddcd63c450691f4d0179dd231283934a37855cdfb677ca69c603b761031657a4cee061446a5ba9caf1a9814191c9ca7bec7c7dc0c763faf0223c MISC metadata.xml 301 BLAKE2B 6cdd21aeeac98df37496013874d4f4bb5f61c31d5615342d0edd90bc60f5d97da9ab8a7d6d7a932c7e495b2884f5f650e93dcd197eedc89139a9c4cac259a437 SHA512 ee61f74e2019216b93688df2c9291797d51c0f2454743d27ac3315e3394294b486447fecd4f3334e15081ef6de9af5d54516ec27fe2ee8ad5d3b4612113428bb 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..7c2438aee8f8 --- /dev/null +++ b/lxde-base/lxpanel/lxpanel-0.10.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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() { + xdg_environment_reset + + 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 +} |