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

4 files changed, 152 insertions, 1 deletions

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>