Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0cccf489d8 | ||
|
|
6f6c0578a7 | ||
|
|
1a5fceb139 | ||
|
|
fe29e221e7 | ||
|
|
194b4fab1f | ||
|
|
18e8a1e5ab | ||
|
|
ceaaf2df28 | ||
|
|
49a548872e |
4 changed files with 74 additions and 100 deletions
|
|
@ -0,0 +1,26 @@
|
|||
From e935beaa73f30dd54253f96ca951a4b47fc9a3b7 Mon Sep 17 00:00:00 2001
|
||||
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
||||
Date: Fri, 15 Aug 2025 15:35:58 +0900
|
||||
Subject: [PATCH] lxsession: workaround for setting ally bus
|
||||
|
||||
---
|
||||
lxsession/environement.vala | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/lxsession/environement.vala b/lxsession/environement.vala
|
||||
index a18f840..503f3f0 100644
|
||||
--- a/lxsession/environement.vala
|
||||
+++ b/lxsession/environement.vala
|
||||
@@ -281,6 +281,9 @@ namespace Lxsession
|
||||
}
|
||||
*/
|
||||
|
||||
+ /* Workaround: set up ally bus */
|
||||
+ lxsession_spawn_command_line_async("gdbus call --session --dest org.a11y.Bus --object-path /org/a11y/bus --method org.a11y.Bus.GetAddress");
|
||||
+
|
||||
if (global_settings.get_item_string("Environment", "toolkit_integration", null) == "true")
|
||||
{
|
||||
/* Enable toolkit integration for OpenOffice.org / LibreOffice, if available. */
|
||||
--
|
||||
2.50.1
|
||||
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
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
|
||||
{
|
||||
|
|
@ -15,24 +15,27 @@
|
|||
%global git_builddir %{nil}
|
||||
|
||||
%if 0%{?use_gitbare}
|
||||
%global gittardate 20231231
|
||||
%global gittartime 1207
|
||||
%global gittardate 20250403
|
||||
%global gittartime 1600
|
||||
%define use_gitcommit_as_rel 0
|
||||
|
||||
%global gitbaredate 20230917
|
||||
%global git_rev e0fffa6645f7c8b1ee9ea1088acd051ba8e733d4
|
||||
%global gitbaredate 20250330
|
||||
%global git_rev 886b9ad90f98b12c775313331431769295138f69
|
||||
%global git_short %(echo %{git_rev} | cut -c-8)
|
||||
%global git_version %{gitbaredate}git%{git_short}
|
||||
|
||||
%if 0%{?use_gitcommit_as_rel}
|
||||
%global git_ver_rpm ^%{git_version}
|
||||
%global git_builddir -%{git_version}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%global main_version 0.5.5
|
||||
%global main_version 0.5.6
|
||||
|
||||
Name: lxsession
|
||||
Version: %{main_version}%{git_ver_rpm}
|
||||
Release: 4%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Lightweight X11 session manager
|
||||
Summary(de): Leichtgewichtiger X11 Sitzungsverwalter
|
||||
|
||||
|
|
@ -49,9 +52,6 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz
|
|||
%if 0%{?use_release}
|
||||
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
|
||||
%endif
|
||||
# https://github.com/lxde/lxsession/pull/34
|
||||
# Fix compilation with gcc14 -Werror=incompatible-pointer-types
|
||||
Patch1: lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch
|
||||
#http://sourceforge.net/p/lxde/bugs/760/
|
||||
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
|
||||
Patch1002: lxsession-0.5.2-notify-daemon-default.patch
|
||||
|
|
@ -65,6 +65,10 @@ Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch
|
|||
# Split out appindicator support and kill it for now:
|
||||
# libappindicator 12.10.1 kills GTK2 vapi support
|
||||
Patch2002: lxsession-0.5.5-split-indicator-support.patch
|
||||
# Workaround for explicitly setting ally bus
|
||||
# ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209584#c6
|
||||
# ref: https://forums.gentoo.org/viewtopic-t-1172784-start-75-postdays-0-postorder-asc-highlight-.html
|
||||
Patch2003: lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch
|
||||
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
#BuildRequires: pkgconfig(indicator-0.4)
|
||||
|
|
@ -157,6 +161,15 @@ do
|
|||
git cherry-pick $commit
|
||||
done
|
||||
|
||||
# Restore timestamps
|
||||
set +x
|
||||
echo "Restore timestamps"
|
||||
git ls-tree -r --name-only HEAD | while read f
|
||||
do
|
||||
unixtime=$(git log -n 1 --pretty='%ct' -- $f)
|
||||
touch -d "@${unixtime}" $f
|
||||
done
|
||||
set -x
|
||||
%endif
|
||||
|
||||
git config user.name "lxpanel Fedora maintainer"
|
||||
|
|
@ -168,12 +181,12 @@ git commit -m "base" -q
|
|||
%endif
|
||||
|
||||
#%patch0 -p1 -b .dsofix
|
||||
cat %PATCH1 | git am
|
||||
%patch -P1000 -p1 -b .reload
|
||||
%patch -P1002 -p1 -b .notify
|
||||
%patch -P1005 -p1 -b .nullcheck
|
||||
%patch -P2001 -p1 -b .custom
|
||||
%patch -P2002 -p1 -b .indicator
|
||||
%patch -P2003 -p1 -b .ally
|
||||
%if 0%{?use_gitbare}
|
||||
git commit -m "Apply Fedora specific configulation" -a
|
||||
%endif
|
||||
|
|
@ -299,6 +312,30 @@ cd ..
|
|||
%{_datadir}/%{name}/ui/lxpolkit.ui
|
||||
|
||||
%changelog
|
||||
* Fri Aug 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.6-3
|
||||
- Add workaround for setting a11y bus explicitly
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Apr 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.6-1
|
||||
- 0.5.6
|
||||
|
||||
* Thu Feb 13 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20241019gitc72db4f8-1
|
||||
- Update to the latest git
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20240821git95e902d7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sun Aug 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20240821git95e902d7-1
|
||||
- Update to the latest git
|
||||
|
||||
* Tue Aug 13 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20240812git626a654b-1
|
||||
- Update to the latest git
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20230917gite0fffa66-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Feb 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-4
|
||||
- Apply upstream PR for gcc14 -Werror=incompatible-pointer-types
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (lxsession-20231231T1207.tar.gz) = a8a144fdfb4808d4cf82a4bea0926052f754f1be4c3f934f203a67b8a49856eca683cc0300d48710256bdc1642e191c01eae8dd0ef4c6fbd5743a80769e86444
|
||||
SHA512 (lxsession-20250403T1600.tar.gz) = b3282ea072d3cf2552c9581cca8251f9f7b2f7c7e062b4a9ee4d9725ab2218f35dd437beab53d56417b94a036d428cfe196b58a0e9af73d33f295bbefd938a5e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue