gentoo auto-resync : 07:08:2024 - 12:37:20

14 files changed, 532 insertions, 1 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index f2984d2ab2cc..f58b4f89dbf3 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
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
+}
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 9642306299ea..5962a11abad0 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,5 +1,7 @@
 AUX lxsession-0.5.2-notify-daemon-default.patch 709 BLAKE2B 7f2c75ce81e70abbe0c9621d6d5605a87925f2231d86644dadf93235349a90fa733b75b9a371833c4b8b482b43c644c617f041ac1f29df1d94550cc0d7abd7c8 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c
 AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75e264fd45b1861b05ece4085a3fc48be94ccc60011e496eba605410cf1d7f08289b49e1a62e6b7b562b0edeef1bff50 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1
+AUX lxsession-0.5.5-c99.patch 3732 BLAKE2B a3998eafbed66de19871d72caa2bcd6f55b061ee1290dedb85e5dd99149b5b4cde1480c6f7a95797c9182b48552f3c4008dfe9073ac21eb141b333fdaa152fc2 SHA512 010ae8616b13d8e0f438a7baf045c638fdff7b9ba77bb6d7f75efc7ed4e8e281ef7d40d2fc3656a344e8f1ad681ac8499e46ed5f84df58337ec2b4bdd541242d
 DIST lxsession-0.5.5.tar.xz 422564 BLAKE2B 27910f84ecd8df8af06649235d33604eb83e8203f6a485a7450a91887de691d161acf8f51d8c1786f8d073966ba88d20296275adc131b9fa1c670c0f9e3ecdef SHA512 12e25214485cf855b380a5aa91eb536f31536c98f5a50a1115cb4bf8ff884c7cdcd40c69a1502eeb9f4d3e6169e0607d6488ef3152ee184662fee39fe7a04d54
+EBUILD lxsession-0.5.5-r1.ebuild 1205 BLAKE2B 66d76518bcd819178a5739e8388e303adf41493999c58e4d14c69551a76ae8b6b7cc4f39dae38bd435103284be6f7f7901828cb031b5e0a2898135fd3cada6f7 SHA512 1aea584f29b068e2336e31e4d675809d5b6fc67ee3897e4fc7b42a352b90c06614bc2bdec65966becf42debac10aa5efdf48e410f3655ba3cba7711e84686ced
 EBUILD lxsession-0.5.5.ebuild 1174 BLAKE2B 98ebc3d837f4457d432bd97fe2f2ab8b155738fece037e27cd25a732fb3e45a5a090efb10ef639b4e47ff44facab6d5bc106e7c413652d9b1370ce4ceacb4749 SHA512 c775a339273870f2f455cd4f73853b0a4aa836b61bcf2749480c35f352b52d2367fb2ea117e65dcf863c59d7f2b3b390762c1c830e08d5c21b7799d29807b515
-MISC metadata.xml 247 BLAKE2B 3b37ff1877cfc7fcc0e16b26e64daf919cea425d6f26460e2c4f8d732e2c729de13bdff9c518ed7878f5bffac3a0312e1a72131b1c61d3ab6b8c013c35208f4f SHA512 8e4697c27ada4b1f484c98d641b66fe364cb2ebc7d85960e056c31ff659a4460f44442ba26fe0c89becc1a4e02631e171fafb597875350faec022b172f8901e4
+MISC metadata.xml 303 BLAKE2B 4fb43814485557aa78ade9a54596d98ebd22358677c8da2c40f83fab139a1627ef4f2185257891f0704eab6cda905c72dd46e2f0394a35ee2f037339675b7578 SHA512 5ad9d132828df365e6d8addeecc6a66ccfdb319c6241704bd355357ae5429f48604f1f04d216206e2b60a96c82c5ea0c3c00287d2c366a5c4bb52228d0568410
diff --git a/lxde-base/lxsession/files/lxsession-0.5.5-c99.patch b/lxde-base/lxsession/files/lxsession-0.5.5-c99.patch
new file mode 100644
index 000000000000..8f79578026cb
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.5.5-c99.patch
@@ -0,0 +1,86 @@
+https://github.com/lxde/lxsession/pull/34
+
+From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Sun, 25 Feb 2024 16:58:43 +0900
+Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to -Werror=incompatible-pointer-types.
+To support compilation with gcc14, cast GTK related objects
+properly.
+--- a/lxpolkit/lxpolkit-listener.c
++++ b/lxpolkit/lxpolkit-listener.c
+@@ -85,13 +85,13 @@ static void on_completed(PolkitAgentSession* session, gboolean authorized, DlgDa
+ 
+     if(!authorized && !g_cancellable_is_cancelled(data->cancellable))
+     {
+-        show_msg(data->dlg, GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?"));
++        show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?"));
+         /* initiate a new session */
+         g_object_unref(data->session);
+         data->session = NULL;
+-        gtk_entry_set_text(data->request, "");
++        gtk_entry_set_text(GTK_ENTRY(data->request), "");
+         gtk_widget_grab_focus(data->request);
+-        on_user_changed(data->id, data);
++        on_user_changed(GTK_COMBO_BOX(data->id), data);
+         return;
+     }
+     g_simple_async_result_complete(data->result);
+@@ -106,20 +106,20 @@ static void on_request(PolkitAgentSession* session, gchar* request, gboolean ech
+         msg = _("Password: ");
+     else
+         msg = request;
+-    gtk_label_set_text(data->request_label, msg);
+-    gtk_entry_set_visibility(data->request, echo_on);
++    gtk_label_set_text(GTK_LABEL(data->request_label), msg);
++    gtk_entry_set_visibility(GTK_ENTRY(data->request), echo_on);
+ }
+ 
+ static void on_show_error(PolkitAgentSession* session, gchar* text, DlgData* data)
+ {
+     DEBUG("on error: %s", text);
+-    show_msg(data->dlg, GTK_MESSAGE_ERROR, text);
++    show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, text);
+ }
+ 
+ static void on_show_info(PolkitAgentSession* session, gchar* text, DlgData* data)
+ {
+     DEBUG("on info: %s", text);
+-    show_msg(data->dlg, GTK_MESSAGE_INFO, text);
++    show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_INFO, text);
+ }
+ 
+ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data)
+@@ -127,7 +127,7 @@ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data)
+     DEBUG("on_response: %d", response);
+     if(response == GTK_RESPONSE_OK)
+     {
+-        const char* request = gtk_entry_get_text(data->request);
++        const char* request = gtk_entry_get_text(GTK_ENTRY(data->request));
+         polkit_agent_session_response(data->session, request);
+         gtk_widget_set_sensitive(data->dlg, FALSE);
+     }
+@@ -195,7 +195,7 @@ static void initiate_authentication(PolkitAgentListener  *listener,
+         DEBUG("%s: %s", *p, polkit_details_lookup(details, *p));
+ #endif
+     data->listener = (LXPolkitListener*)listener;
+-    data->result = g_simple_async_result_new(listener, callback, user_data, initiate_authentication);
++    data->result = g_simple_async_result_new(G_OBJECT(listener), callback, user_data, initiate_authentication);
+ 
+     data->action_id = g_strdup(action_id);
+     data->cancellable = (GCancellable*)g_object_ref(cancellable);
+@@ -260,10 +260,10 @@ static void initiate_authentication(PolkitAgentListener  *listener,
+                 g_free(str);
+             }
+         }
+-        gtk_combo_box_set_model(data->id, GTK_TREE_MODEL(store));
++        gtk_combo_box_set_model(GTK_COMBO_BOX(data->id), GTK_TREE_MODEL(store));
+         g_object_unref(store);
+         /* select the fist user in the list */
+-        gtk_combo_box_set_active(data->id, 0);
++        gtk_combo_box_set_active(GTK_COMBO_BOX(data->id), 0);
+     }
+     else
+     {
+
diff --git a/lxde-base/lxsession/lxsession-0.5.5-r1.ebuild b/lxde-base/lxsession/lxsession-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..d57b9498dd15
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=lxde-base/lxde-common-0.99.2-r1
+	sys-apps/dbus
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+	"${FILESDIR}"/${PN}-0.5.5-c99.patch
+)
+
+src_prepare() {
+	rm *.stamp || die
+	vala_setup
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (logind), and suspend/hibernate (UPower)
+	econf \
+		$(use_enable nls) \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml
index eb6c52bb507a..e3f9296162f9 100644
--- a/lxde-base/lxsession/metadata.xml
+++ b/lxde-base/lxsession/metadata.xml
@@ -4,5 +4,6 @@
   <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">lxde</remote-id>
+    <remote-id type="github">lxde/lxsession</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index b73ca5d9a444..63cbbb80eaed 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,3 +1,7 @@
+AUX lxterminal-0.4.0-c99.patch 2390 BLAKE2B ef86c1b806a7e956a36be133069bf3bdc07e6f23d3d252e8459a8f806516642ab864c90079ee27dcadf7e81f52b1b1d76da1c7e02296ab92a8a0333bf8edeecc SHA512 28a54b12c0bf266b3ad06a10fdc2c7cb596a2f435598925bdbfd5aabb3efd08b13a51685e8ee4ef2a91606c8a46be02826bb7c11255b27dac56569da575d4704
+AUX lxterminal-0.4.0-crash-on-exit.patch 2630 BLAKE2B 9f13e7f1e489f52b0715a03458aec4590e91bbbd5ae79469c43ec1e9fc2e51554326cde5a9e3f8ba6f6575ea0b53a692885023e41e2ef53836663ee223eff691 SHA512 19b6142fac501f1090adf1d785e0b8ce88adc5b748baa065662c075a19535e29f0ac48dfa4d3edad62e12881792c5d4b477737d61cc8453038d53eac890bc70d
 DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
+DIST lxterminal-0.4.0_p20230917.tar.gz 163085 BLAKE2B c26051fdf814da3989d74a14ad726b72e45afb1189c01ac6f3897daecc2473c3cfe1574976ab96bfe08ce7e2b84652471b6e839a17dd0c44932244c5936bd8c1 SHA512 4d00e979add7c2322703d0761707d9a935bb839ffcc981a61c51f28cb37466768c373dc03b9d8ae159e0e919d824c7d7f20bb9b2abda465092016c3692449c9d
 EBUILD lxterminal-0.4.0.ebuild 817 BLAKE2B 14b9917b5c5cb1d976777b2a0d69fb8c2f25416ff21f957de22a240cbdf62e73c2d08f2a3b9d2f6f7c5f53431b086a76c0b1fda6c8195ab27d6888500232e0ae SHA512 9782eb25efcf5a861ba2a6f760d12ade595e7613f69c9a4370439ba42eaa157cca661c6ca3e8a684daaf89b1c14d5d4e8c5f370600ad2d42bd1d27d845ebf531
+EBUILD lxterminal-0.4.0_p20230917.ebuild 1139 BLAKE2B 6823fd156822dd732ecaee8112d34ab7b9b1ab218dd3e1c1ddde8ad5987225e959c82d62ca270b2d4382a17ff3bdad649e37fe9d15a61ad7bd5a84eb960dcf38 SHA512 ef2953fed9ca7028b5a130129cbbb2fb49809119d0067c9b842f8efb18b815dd18ab691bad895024fd2aee7ff9f08c836c3f495670a7b5f27a72e9002e3bbb52
 MISC metadata.xml 296 BLAKE2B b60c416597393c9944dc00a2ed51cd8117e0a6deeebf778b5d7f7bb5da4643c510d8a002c0778fe5b835aa7817854fa0ba1a2ffbbe690855999028d13c9f79fc SHA512 5484c2d095231eccfef4100e64808b99dcacd2a2c19558f4c6e44e665f720dfd417455d50c25960eef5dfdfdf761adf8bbb1a9689be78c51b4d350967cf4dcbb
diff --git a/lxde-base/lxterminal/files/lxterminal-0.4.0-c99.patch b/lxde-base/lxterminal/files/lxterminal-0.4.0-c99.patch
new file mode 100644
index 000000000000..7694e94b34af
--- /dev/null
+++ b/lxde-base/lxterminal/files/lxterminal-0.4.0-c99.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/919094
+https://github.com/lxde/lxterminal/issues/121
+https://github.com/lxde/lxterminal/pull/122
+https://src.fedoraproject.org/rpms/lxterminal/blob/rawhide/f/lxterminal-pr122-fix-gcc14-incompatible-pointer-types.patch
+
+From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Wed, 21 Feb 2024 17:01:14 +0900
+Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to -Werror=incompatible-pointer-types .
+Fix code to support this.
+
+* Add GTK cast for GTK_STYLE_PROVIDER
+* VteRegex must be deref'ed with vte_regex_unref
+
+Fixes #121 .
+---
+ src/lxterminal.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index 680e411..dcd7405 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -1208,7 +1208,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     GtkStyleContext* box_style_ctx =
+         gtk_widget_get_style_context(GTK_WIDGET(terminal->box));
+     gtk_style_context_add_provider(
+-        box_style_ctx, box_css_provider,
++        box_style_ctx, GTK_STYLE_PROVIDER(box_css_provider),
+         GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+     #endif
+ 
+@@ -1232,6 +1232,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+     ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
++    vte_regex_unref(dingus1);
++    vte_regex_unref(dingus2);
+ #else
+     GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL);
+     GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL);
+@@ -1239,9 +1241,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+     ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+-#endif
+     g_regex_unref(dingus1);
+     g_regex_unref(dingus2);
++#endif
+ 
+     /* Create a horizontal box inside an event box as the toplevel for the tab label. */
+     term->tab = gtk_event_box_new();
diff --git a/lxde-base/lxterminal/files/lxterminal-0.4.0-crash-on-exit.patch b/lxde-base/lxterminal/files/lxterminal-0.4.0-crash-on-exit.patch
new file mode 100644
index 000000000000..bdf9ca1f3c98
--- /dev/null
+++ b/lxde-base/lxterminal/files/lxterminal-0.4.0-crash-on-exit.patch
@@ -0,0 +1,57 @@
+https://src.fedoraproject.org/rpms/lxterminal/blob/rawhide/f/lxterminal-0.4.0-avoid-segv-on-window-close.patch
+--- lxterminal-0.4.0/src/lxterminal.c.orig	2023-05-26 13:59:55.800250980 +0900
++++ lxterminal-0.4.0/src/lxterminal.c	2023-06-09 14:03:22.478441852 +0900
+@@ -59,6 +59,7 @@ static void terminal_new_window_activate
+ static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+ static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+ static void terminal_close_window_activate_event(GtkAction * action, LXTerminal * terminal);
++static void terminal_close_window_activate_event_internal(GtkAction * action, LXTerminal * terminal);
+ static void terminal_open_url_activate_event(GtkAction * action, LXTerminal * terminal);
+ static void terminal_copy_url_activate_event(GtkAction * action, LXTerminal * terminal);
+ static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
+@@ -480,15 +481,28 @@ static void terminal_close_window_activa
+     if (!terminal_close_window_confirmation_dialog(terminal)) {
+         return;
+     }
++    terminal_close_window_activate_event_internal(action, terminal);
++}
+ 
++static void terminal_close_window_activate_event_internal(GtkAction * action, LXTerminal * terminal)
++{
+     /* Play it safe and delete tabs one by one. */
+-    while(terminal->terms->len > 0) {
++    while(1 /* terminal->terms->len > 0 */) {
++      /* terminal_child_exited_event() finally frees terminal->terms */
++      /* terminal_window_exit() finally frees terminal itself
++         when closing one window of multiple ones
++        */
++        guint len = terminal->terms->len;
+         Term *term = g_ptr_array_index(terminal->terms, 0);
+ #if VTE_CHECK_VERSION (0, 38, 0)
+         terminal_child_exited_event(VTE_TERMINAL(term->vte), 0, term);
+ #else
+         terminal_child_exited_event(VTE_TERMINAL(term->vte), term);
+ #endif
++       if (len <= 1) {
++          break;
++        }
++
+     }
+ }
+ 
+@@ -838,7 +852,15 @@ static void terminal_window_title_change
+ /* Handler for "delete-event" signal on a LXTerminal. */
+ static gboolean terminal_close_window_confirmation_event(GtkWidget * widget, GdkEventButton * event, LXTerminal * terminal)
+ {
++#if 0
+     return !terminal_close_window_confirmation_dialog(terminal);
++#else
++    gboolean status = terminal_close_window_confirmation_dialog(terminal);
++    if (status) {
++        terminal_close_window_activate_event_internal(NULL, terminal);
++    }
++    return TRUE; /* Always nuke this event, call the above function explicitly */
++#endif
+ }
+ 
+ /* Display closing tabs warning */
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild
new file mode 100644
index 000000000000..28f02527696b
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.4.0_p20230917.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+if [[ ${PV} == *_p* ]] ; then
+	TERMINAL_COMMIT="9b4299c292567b371158368686088900a4c0a128"
+	SRC_URI="https://github.com/lxde/lxterminal/archive/${TERMINAL_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${TERMINAL_COMMIT}
+else
+	SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	>=x11-libs/vte-0.28.0:2.91
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.0-crash-on-exit.patch
+	"${FILESDIR}"/${PN}-0.4.0-c99.patch
+)
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-man --enable-gtk3
+}