diff options
author | Matteo Bernardini | 2024-05-16 17:38:17 +0200 |
---|---|---|
committer | Matteo Bernardini | 2024-06-01 14:01:49 +0200 |
commit | 44e15304a317f08c720b84de49d13606892f2895 (patch) | |
tree | 31ed07d4dd9bfdaf9db205f60d9ef622e7254351 | |
parent | a0d1ab69c9963cb2cc62703291fae30c09d35fea (diff) | |
download | slackbuilds-lxsession.tar.gz |
system/lxsession: Updated for version 20240415_f68f477.lxsession
Patch for gcc >= 14.x
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r-- | system/lxsession/gcc14.patch | 89 | ||||
-rw-r--r-- | system/lxsession/lxsession.SlackBuild | 9 | ||||
-rw-r--r-- | system/lxsession/lxsession.info | 6 |
3 files changed, 97 insertions, 7 deletions
diff --git a/system/lxsession/gcc14.patch b/system/lxsession/gcc14.patch new file mode 100644 index 0000000000..5e612edc6a --- /dev/null +++ b/system/lxsession/gcc14.patch @@ -0,0 +1,89 @@ +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. +--- + lxpolkit/lxpolkit-listener.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lxpolkit/lxpolkit-listener.c b/lxpolkit/lxpolkit-listener.c +index 00bda42..819d2c5 100644 +--- 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/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild index f900a0f37c..16ca1227b8 100644 --- a/system/lxsession/lxsession.SlackBuild +++ b/system/lxsession/lxsession.SlackBuild @@ -73,8 +73,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxsession -VERSION=${VERSION:-0.5.5} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20240415_f68f477} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -129,8 +129,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -rm *.stamp -autoreconf -fi +patch -p1 < $CWD/gcc14.patch + +./autogen.sh || true CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info index 116fd62cde..b773231844 100644 --- a/system/lxsession/lxsession.info +++ b/system/lxsession/lxsession.info @@ -1,8 +1,8 @@ PRGNAM="lxsession" -VERSION="0.5.5" +VERSION="20240415_f68f477" HOMEPAGE="https://wiki.lxde.org/en/LXSession" -DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz" -MD5SUM="e8380acef215ee7c99c067a2241c2c7b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxsession-20240415_f68f477.tar.xz" +MD5SUM="4903b76d535be464c20e57e7a5aea6c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique3" |