Compare commits
13 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0cccf489d8 | ||
|
|
6f6c0578a7 | ||
|
|
1a5fceb139 | ||
|
|
fe29e221e7 | ||
|
|
194b4fab1f | ||
|
|
18e8a1e5ab | ||
|
|
ceaaf2df28 | ||
|
|
49a548872e | ||
|
|
0dca476d35 | ||
|
|
756d4a0856 | ||
|
|
278ae10ee1 | ||
|
|
36c8760624 | ||
|
|
aef7afccd6 |
3 changed files with 88 additions and 24 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
|
||||
|
||||
|
|
@ -3,48 +3,39 @@
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=442268
|
||||
|
||||
%global use_release 0
|
||||
%global use_git 0
|
||||
%global use_gitbare 1
|
||||
|
||||
%if 0%{?use_git} < 1
|
||||
%if 0%{?use_gitbare} < 1
|
||||
# force
|
||||
%global use_release 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%global git_version %{nil}
|
||||
%global git_ver_rpm %{nil}
|
||||
%global git_builddir %{nil}
|
||||
|
||||
%if 0%{?use_git}
|
||||
%global git_rev 138ff9b22b45192a3b020ebbbed04e9060470a66
|
||||
%global git_date 20161125
|
||||
%global git_short %(echo %{git_rev} | cut -c-8)
|
||||
%global git_version %{git_date}git%{git_short}
|
||||
%endif
|
||||
|
||||
%if 0%{?use_gitbare}
|
||||
%global gittardate 20230815
|
||||
%global gittartime 1413
|
||||
%global gittardate 20250403
|
||||
%global gittartime 1600
|
||||
%define use_gitcommit_as_rel 0
|
||||
|
||||
%global gitbaredate 20230810
|
||||
%global git_rev 27c1eaf63019da8b67634a9b0f3623800e79f88a
|
||||
%global gitbaredate 20250330
|
||||
%global git_rev 886b9ad90f98b12c775313331431769295138f69
|
||||
%global git_short %(echo %{git_rev} | cut -c-8)
|
||||
%global git_version %{gitbaredate}git%{git_short}
|
||||
%endif
|
||||
|
||||
%if 0%{?use_git} || 0%{?use_gitbare}
|
||||
%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: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Lightweight X11 session manager
|
||||
Summary(de): Leichtgewichtiger X11 Sitzungsverwalter
|
||||
|
||||
|
|
@ -58,9 +49,6 @@ URL: http://lxde.sourceforge.net/
|
|||
%if 0%{?use_gitbare}
|
||||
Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz
|
||||
%endif
|
||||
%if 0%{?use_git}
|
||||
Source0: %{name}-%{version}-%{?git_version}.tar.bz2
|
||||
%endif
|
||||
%if 0%{?use_release}
|
||||
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
|
||||
%endif
|
||||
|
|
@ -77,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)
|
||||
|
|
@ -145,7 +137,7 @@ LXPolKit is a simple PolicyKit authentication agent developed for LXDE, the
|
|||
Lightweight X11 Desktop Environment.
|
||||
|
||||
%prep
|
||||
%if 0%{?use_release} || 0%{?use_git}
|
||||
%if 0%{?use_release}
|
||||
%setup -q -n %{name}-%{main_version}%{git_builddir}
|
||||
|
||||
git init
|
||||
|
|
@ -169,12 +161,21 @@ 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"
|
||||
git config user.email "lxpanel-maintainers@fedoraproject.org"
|
||||
|
||||
%if 0%{?use_release} || 0%{?use_git}
|
||||
%if 0%{?use_release}
|
||||
git add .
|
||||
git commit -m "base" -q
|
||||
%endif
|
||||
|
|
@ -185,6 +186,7 @@ git commit -m "base" -q
|
|||
%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
|
||||
|
|
@ -310,6 +312,42 @@ 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
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20230917gite0fffa66-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-2
|
||||
- Change -Wincompatible-pointer-types from error to warning
|
||||
|
||||
* Sun Dec 31 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-1
|
||||
- Update to the latest git
|
||||
|
||||
* Tue Aug 15 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230810git27c1eaf6-1
|
||||
- Update to the latest git
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (lxsession-20230815T1413.tar.gz) = 5eff576cfb7078b6d71625cb322b11e9627c643d3cb03aabfbd2121731d5755a4918e99163275cc95b873e67696b6bbb1fd8fcc9721c65c654d8ed54c50d5c6c
|
||||
SHA512 (lxsession-20250403T1600.tar.gz) = b3282ea072d3cf2552c9581cca8251f9f7b2f7c7e062b4a9ee4d9725ab2218f35dd437beab53d56417b94a036d428cfe196b58a0e9af73d33f295bbefd938a5e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue