From ac9517058fcec1e24529aba2738bc9f53fe95b10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:32:40 +0000 Subject: [PATCH 01/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index 2bc8fb0..ff24d3a 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Mar 20 2021 Mamoru TASAKA - 0.5.5-7.D20210130git8543c00a - Avoid lxsession-default-apps segfault (with recent glib2) From d3b3bf0074dbef9dbaa327830841bfaf17a6dfab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:29:26 +0000 Subject: [PATCH 02/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index ff24d3a..d3cc939 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 459c2e645c04119992201f1783f8bc1ed9fbf241 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:17:46 +0000 Subject: [PATCH 03/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index d3cc939..9a73070 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 587882ddef6986b8f2a58aae8161b08f822274fa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Sep 2022 15:21:47 +0900 Subject: [PATCH 04/25] Update to the latest git (20210419) --- .gitignore | 14 +------------- lxsession.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index e554212..00cce38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -lxsession-0.4.4.tar.gz -/lxsession-0.4.5.tar.gz -/lxsession-0.4.6.1.tar.gz -/0.5.2.tar.gz -/lxsession-0.5.2.tar.xz -/lxsession-0.5.2-D20160417git9f8d613332abec5ec0b64b94e1a17caa0c56798b.tar.gz -/lxsession-0.5.2-D20160817git699c1695c2adcf0ec04d9da579c65a66417064f0.tar.gz -/lxsession-0.5.2-D20161106git7b9a9580da6929af5bf8d1c577cc61db990c8d91.tar.gz -/lxsession-0.5.3-D20161210gite284f41ad4467c8b292d94cbcbc9a3393c618da5.tar.gz -/lxsession-0.5.3.tar.xz -/lxsession-0.5.4.tar.xz -/lxsession-0.5.5.tar.xz -/lxsession-20210202T1502.tar.gz +/lxsession-*.tar.gz diff --git a/lxsession.spec b/lxsession.spec index 9a73070..0a4fadd 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -21,15 +21,15 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20210202 -%global gittartime 1502 -%global gitbaredate 20210130 -%global git_rev 8543c00a2de2533d1fb2d661508410df1c073011 +%global gittardate 20220913 +%global gittartime 1507 +%global gitbaredate 20210419 +%global git_rev 82580e4559e034d1879071baae152a699f5aa1b0 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 7 +%global mainrel 8 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Tue Sep 13 2022 Mamoru TASAKA - 0.5.5-8.D20210419git82580e45 +- Update to the latest git (20210419) + * Thu Jul 21 2022 Fedora Release Engineering - 0.5.5-7.D20210130git8543c00a.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index df924d7..770e48b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20210202T1502.tar.gz) = fcadc6ebe3d632e21b36b19e131856af28b9949fcbca656cd0fe1ca3248b62e225b75e604720899dd457041599f50daac5bce9647e243583b2ee9a8542243184 +SHA512 (lxsession-20220913T1507.tar.gz) = 54ca0362e6b0998aad8dba6e60b8f3ecb44f356bcc3c04f1a6942daf0355f58011947afe3bc116f51827ebc6698efe1c16a0c227c8bd0b77d11aac98cc297aba From 081496bc2bbeb3980fe99058760d9244055a21c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:43:51 +0000 Subject: [PATCH 05/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index 0a4fadd..c5eee92 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.5.5-8.D20210419git82580e45.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 13 2022 Mamoru TASAKA - 0.5.5-8.D20210419git82580e45 - Update to the latest git (20210419) From 733c84e34df276d37be943c9f3e75e0c7b395f50 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 20 Jan 2023 11:06:44 +0900 Subject: [PATCH 06/25] F-37+: kill appindicator support for now due to 12.10.1 GTK2 support removal --- lxsession-0.5.5-split-indicator-support.patch | 144 ++++++++++++++++++ lxsession.spec | 15 +- 2 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 lxsession-0.5.5-split-indicator-support.patch diff --git a/lxsession-0.5.5-split-indicator-support.patch b/lxsession-0.5.5-split-indicator-support.patch new file mode 100644 index 0000000..095ca71 --- /dev/null +++ b/lxsession-0.5.5-split-indicator-support.patch @@ -0,0 +1,144 @@ +diff --git a/Makefile.am b/Makefile.am +index 5a1177e..7d20d37 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -459,9 +459,13 @@ lxsession_lxsession_CPPFLAGS += \ + lxsession_lxsession_LDADD += \ + $(GTK_LIBS) + ++if USE_INDICATOR ++lxsession_lxsession_VALAFLAGS += \ ++ --pkg appindicator-0.1 ++endif ++ + if USE_ADVANCED_NOTIFICATIONS + lxsession_lxsession_VALAFLAGS += \ +- --pkg appindicator-0.1 \ + --pkg libnotify \ + -D USE_ADVANCED_NOTIFICATIONS + +diff --git a/configure.ac b/configure.ac +index 38c6c93..33a6fc7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -108,7 +108,6 @@ else + AS_HELP_STRING([--enable-advanced-notifications], + [Build with advanced notification using indicators and libnotify (default: no)]), + use_advanced_notifications=$enableval, use_advanced_notifications="no") +- + fi + + AM_CONDITIONAL(USE_BUILDIN_CLIPBOARD, test "$use_buildin_clipboard" = "yes") +@@ -117,7 +116,8 @@ AM_CONDITIONAL(USE_GTK3, test "$enable_gtk3" = "yes") + AM_CONDITIONAL(USE_ADVANCED_NOTIFICATIONS, test "$use_advanced_notifications" = "yes") + + if test "$use_advanced_notifications" = "yes"; then +- PKG_CHECK_MODULES(INDICATORS, [indicator-0.4 >= 0.4.93 appindicator-0.1]) ++ use_indicator=no ++ PKG_CHECK_MODULES(INDICATORS, [indicator-0.4 >= 0.4.93 appindicator-0.1], [use_indicator=no], [use_indicator=no]) + AC_SUBST(INDICATORS_CFLAGS) + AC_SUBST(INDICATORS_LIBS) + +@@ -126,6 +126,9 @@ if test "$use_advanced_notifications" = "yes"; then + AC_SUBST(LIBNOTIFY_LIBS) + fi + ++AM_CONDITIONAL(USE_INDICATOR, test "$use_indicator" = "yes") ++ ++ + if test "$use_buildin_polkit" = "yes"; then + HIDE_LXPOLKIT_AUTOSTART=true + else +diff --git a/lxsession/notifications.vala b/lxsession/notifications.vala +index 5432aa8..b706ab8 100644 +--- a/lxsession/notifications.vala ++++ b/lxsession/notifications.vala +@@ -19,7 +19,9 @@ + #if USE_GTK + using Gtk; + #if USE_ADVANCED_NOTIFICATIONS ++#if USE_INDICATOR + using AppIndicator; ++#endif + using Notify; + #endif + #endif +@@ -78,7 +80,9 @@ namespace Lxsession + public MenuObject menu; + #if USE_GTK + #if USE_ADVANCED_NOTIFICATIONS ++#if USE_INDICATOR + public Indicator indicator; ++#endif + public Notify.Notification notification; + #endif + #endif +@@ -106,7 +110,9 @@ namespace Lxsession + this.menu = menu_param; + #if USE_GTK + #if USE_ADVANCED_NOTIFICATIONS ++#if USE_INDICATOR + this.indicator = new Indicator(this.name, this.icon_name, IndicatorCategory.APPLICATION_STATUS); ++#endif + this.notification = new Notify.Notification ("LXsession", this.notification_text, this.icon_name); + this.notification.set_timeout(6000); + #endif +@@ -117,6 +123,7 @@ namespace Lxsession + #if USE_ADVANCED_NOTIFICATIONS + public void init() + { ++#if USE_INDICATOR + if (this.indicator == null) + { + this.indicator = new Indicator(this.name, this.icon_name, IndicatorCategory.APPLICATION_STATUS); +@@ -128,10 +135,12 @@ namespace Lxsession + { + this.indicator.set_menu(this.menu); + } ++#endif + } + + public void activate() + { ++#if USE_INDICATOR + message("Try activate"); + if (this.indicator != null) + { +@@ -147,10 +156,12 @@ namespace Lxsession + } + message("Activate done"); + } ++#endif + } + + public void inactivate() + { ++#if USE_INDICATOR + message("Try inactivate"); + if (this.indicator != null) + { +@@ -158,19 +169,24 @@ namespace Lxsession + this.indicator.set_status(IndicatorStatus.PASSIVE); + message("Inactivate done"); + } ++#endif + } + + public void set_icon(string param_icon_name) + { ++#if USE_INDICATOR + this.icon_name = param_icon_name; + message("Set new icon"); + this.indicator.icon_name = param_icon_name; ++#endif + } + + public void set_menu(MenuObject param_menu) + { ++#if USE_INDICATOR + this.menu = param_menu; + this.indicator.set_menu(param_menu); ++#endif + } + + public void add_action (string action, string label, owned ActionCallback callback) diff --git a/lxsession.spec b/lxsession.spec index c5eee92..d1e9ee8 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -29,7 +29,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 8 +%global mainrel 9 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -43,7 +43,7 @@ Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -74,10 +74,13 @@ Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1830588 # add custom directory to XDG_CONFIG_DIRS 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 BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(indicator-0.4) -BuildRequires: pkgconfig(appindicator-0.1) +#BuildRequires: pkgconfig(indicator-0.4) +#BuildRequires: pkgconfig(appindicator-0.1) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: make @@ -184,6 +187,7 @@ git commit -m "base" -q %patch1002 -p1 -b .notify %patch1005 -p1 -b .nullcheck %patch2001 -p1 -b .custom +%patch2002 -p1 -b .indicator %if 0%{?use_gitbare} git commit -m "Apply Fedora specific configulation" -a %endif @@ -298,6 +302,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Fri Jan 20 2023 Mamoru TASAKA - 0.5.5-9.D20210419git82580e45 +- F-37+: kill appindicator support for now due to 12.10.1 GTK2 support removal + * Thu Jan 19 2023 Fedora Release Engineering - 0.5.5-8.D20210419git82580e45.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 71b9ac6acf5611e1122bcfa9403478f0a65aaf07 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:15:38 +0900 Subject: [PATCH 07/25] rename release macro to make rpmdev-bumprelease work --- lxsession.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index d1e9ee8..9bf79b4 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -32,18 +32,18 @@ %global mainrel 9 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_git} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: lxsession Version: 0.5.5 -Release: %{fedorarel}%{?dist} +Release: %{baserelease}%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter From eac7d6d7b18c019aa32f03224aa36f89314c7520 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:22:02 +0900 Subject: [PATCH 08/25] fix baserelease usage --- lxsession.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index 9bf79b4..d62a5fd 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -29,21 +29,21 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 9 +%global baserelease 9 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_git} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: lxsession Version: 0.5.5 -Release: %{baserelease}%{?dist} +Release: %{fedorarel}%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter From 688e9dd7bd0dc8b0aeadec4b0a9bba600886f85d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 12 Jun 2023 16:54:38 +0900 Subject: [PATCH 09/25] Always create parent directory for lxsession autostart file (bug 2213030) --- ...read_autostart_conf-create-directory.patch | 47 +++++++++++++++++++ lxsession.spec | 19 +++++--- 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 lxsession-0.5.5-read_autostart_conf-create-directory.patch diff --git a/lxsession-0.5.5-read_autostart_conf-create-directory.patch b/lxsession-0.5.5-read_autostart_conf-create-directory.patch new file mode 100644 index 0000000..1867fb8 --- /dev/null +++ b/lxsession-0.5.5-read_autostart_conf-create-directory.patch @@ -0,0 +1,47 @@ +--- lxsession-0.5.5/lxsession-default-apps/autostart.vala.conf_noexist 2023-06-12 15:52:43.574275326 +0900 ++++ lxsession-0.5.5/lxsession-default-apps/autostart.vala 2023-06-12 15:58:54.735990230 +0900 +@@ -23,6 +23,24 @@ namespace LDefaultApps + string config_path; + config_path = get_config_home_path("autostart"); + var config_file = File.new_for_path (config_path); ++ ++ /* Make it sure that parent directory for config_file always exists */ ++ { ++ var config_parent = config_file.get_parent(); ++ ++ if (!config_parent.query_exists ()) ++ { ++ try ++ { ++ config_parent.make_directory_with_parents (); ++ } ++ catch (GLib.Error e) ++ { ++ message (e.message); ++ } ++ } ++ } ++ + if (!config_file.query_exists ()) + { + string config_system_path; +@@ -45,19 +63,6 @@ namespace LDefaultApps + else + { + File file = File.new_for_path (config_system_path); +- var config_parent = config_file.get_parent(); +- +- if (!config_parent.query_exists ()) +- { +- try +- { +- config_parent.make_directory_with_parents (); +- } +- catch (GLib.Error e) +- { +- message (e.message); +- } +- } + + try + { diff --git a/lxsession.spec b/lxsession.spec index d62a5fd..ef9d5a2 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -29,7 +29,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global baserelease 9 +%global baserelease 10 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -71,6 +71,9 @@ Patch1002: lxsession-0.5.2-notify-daemon-default.patch # race condition when calling "lxsession -r" from imsettings-lxde and when daemon is not configured yet # explicitly do nullptr check Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2213030 +# Always create parent directory for lxsession autostart file +Patch1006: lxsession-0.5.5-read_autostart_conf-create-directory.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1830588 # add custom directory to XDG_CONFIG_DIRS Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch @@ -183,11 +186,12 @@ git commit -m "base" -q #%patch0 -p1 -b .dsofix %__cat %PATCH1 | git am %__cat %PATCH2 | git am -%patch1000 -p1 -b .reload -%patch1002 -p1 -b .notify -%patch1005 -p1 -b .nullcheck -%patch2001 -p1 -b .custom -%patch2002 -p1 -b .indicator +%patch -P1000 -p1 -b .reload +%patch -P1002 -p1 -b .notify +%patch -P1005 -p1 -b .nullcheck +%patch -P1006 -p1 -b .conf_noexist +%patch -P2001 -p1 -b .custom +%patch -P2002 -p1 -b .indicator %if 0%{?use_gitbare} git commit -m "Apply Fedora specific configulation" -a %endif @@ -302,6 +306,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Mon Jun 12 2023 Mamoru TASAKA - 0.5.5-10.D20210419git82580e45 +- Always create parent directory for lxsession autostart file (bug 2213030) + * Fri Jan 20 2023 Mamoru TASAKA - 0.5.5-9.D20210419git82580e45 - F-37+: kill appindicator support for now due to 12.10.1 GTK2 support removal From 26364209e58fba0f09fb2e23366fece56f2a5151 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:30:33 +0000 Subject: [PATCH 10/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index ef9d5a2..a71426b 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -29,7 +29,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global baserelease 10 +%global baserelease 11 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -306,6 +306,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.5.5-11.D20210419git82580e45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 12 2023 Mamoru TASAKA - 0.5.5-10.D20210419git82580e45 - Always create parent directory for lxsession autostart file (bug 2213030) From 222f986c92bf644afbb2720ee8267ef371957839 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Aug 2023 14:13:23 +0900 Subject: [PATCH 11/25] indentation, SPDX migration, EVR scheme change --- lxsession.spec | 172 +++++++++++++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 78 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index a71426b..86d8b6f 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -2,61 +2,67 @@ # renamed from lxsession-lite. Original review at # https://bugzilla.redhat.com/show_bug.cgi?id=442268 -%global use_release 0 -%global use_git 0 -%global use_gitbare 1 +%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 +%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 D%{git_date}git%{git_short} +%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 20220913 -%global gittartime 1507 -%global gitbaredate 20210419 -%global git_rev 82580e4559e034d1879071baae152a699f5aa1b0 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global gittardate 20220913 +%global gittartime 1507 + +%global gitbaredate 20210419 +%global git_rev 82580e4559e034d1879071baae152a699f5aa1b0 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} %endif -%global baserelease 11 - -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%if 0%{?use_git} >= 1 -%global fedorarel %{baserelease}.%{git_version} -%endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} %endif -Name: lxsession -Version: 0.5.5 -Release: %{fedorarel}%{?dist} -Summary: Lightweight X11 session manager -Summary(de): Leichtgewichtiger X11 Sitzungsverwalter -License: GPLv2+ -URL: http://lxde.sourceforge.net/ +%global main_version 0.5.5 + +Name: lxsession +Version: %{main_version}%{git_ver_rpm} +Release: 1%{?dist} +Summary: Lightweight X11 session manager +Summary(de): Leichtgewichtiger X11 Sitzungsverwalter + +# LGPL-3.0-or-later lxsession-logout/lxsession-logout-dbus-interface.c +# HPND lxsettings-daemon/xsettings-common.c and some files under lxsettings-daemon/ +# GPL-2.0-or-later Others +# SPDX confirmed +License: GPL-2.0-or-later AND HPND AND LGPL-3.0-or-later + +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 +Source0: %{name}-%{version}-%{?git_version}.tar.bz2 %endif %if 0%{?use_release} -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif # https://github.com/lxde/lxsession/pull/27 # Fix lxsession-xdg-autostart segfault @@ -65,48 +71,48 @@ Patch1: lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch # Fix lxsession-default-apps segfault Patch2: lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.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 +Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch +Patch1002: lxsession-0.5.2-notify-daemon-default.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1801071 # race condition when calling "lxsession -r" from imsettings-lxde and when daemon is not configured yet # explicitly do nullptr check -Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch +Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2213030 # Always create parent directory for lxsession autostart file -Patch1006: lxsession-0.5.5-read_autostart_conf-create-directory.patch +Patch1006: lxsession-0.5.5-read_autostart_conf-create-directory.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1830588 # add custom directory to XDG_CONFIG_DIRS -Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch +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 +Patch2002: lxsession-0.5.5-split-indicator-support.patch -BuildRequires: pkgconfig(gtk+-2.0) -#BuildRequires: pkgconfig(indicator-0.4) -#BuildRequires: pkgconfig(appindicator-0.1) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(polkit-agent-1) -BuildRequires: make -BuildRequires: vala -BuildRequires: docbook-utils -BuildRequires: intltool -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: docbook-style-xsl -BuildRequires: %{_bindir}/xsltproc +BuildRequires: pkgconfig(gtk+-2.0) +#BuildRequires: pkgconfig(indicator-0.4) +#BuildRequires: pkgconfig(appindicator-0.1) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(polkit-agent-1) +BuildRequires: make +BuildRequires: vala +BuildRequires: docbook-utils +BuildRequires: intltool +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: docbook-style-xsl +BuildRequires: /usr/bin/xsltproc -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: %{_bindir}/git +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: /usr/bin/git # name changed back from lxsession-lite to lxsession -Obsoletes: lxsession-lite <= 0.3.6-6 -Provides: lxsession-lite = %{version}-%{release} +Obsoletes: lxsession-lite <= 0.3.6-6 +Provides: lxsession-lite = %{version}-%{release} # lxde-settings-daemon was merged into lxsession -Obsoletes: lxde-settings-daemon <= 0.4.1-2 -Provides: lxde-settings-daemon = 0.4.1-3 +Obsoletes: lxde-settings-daemon <= 0.4.1-2 +Provides: lxde-settings-daemon = 0.4.1-3 # required for suspend and hibernate -Requires: upower +Requires: upower %description LXSession is a standard-compliant X11 session manager with shutdown/ @@ -129,7 +135,7 @@ Abhängigkeiten. %package edit -Summary: Simple GUI to configure what’s automatically started in LXDE +Summary: Simple GUI to configure what’s automatically started in LXDE %description edit LXSession-edit is a tool to manage freedesktop.org compliant desktop session @@ -137,10 +143,10 @@ autostarts. Currently adding and removing applications from the startup list is not yet available, but it will be support in the next release. %package -n lxpolkit -Summary: Simple PolicyKit authentication agent -Requires: polkit >= 0.95 +Summary: Simple PolicyKit authentication agent +Requires: polkit >= 0.95 # required to replace polkit-gnome and polkit-kde -Provides: PolicyKit-authentication-agent +Provides: PolicyKit-authentication-agent %description -n lxpolkit @@ -149,18 +155,17 @@ Lightweight X11 Desktop Environment. %prep %if 0%{?use_release} || 0%{?use_git} -%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} +%setup -q -n %{name}-%{main_version}%{git_builddir} git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 git clone ./%{name}.git/ cd %{name} -#git checkout -b %{version}-fedora %{version} -git checkout -b %{version}-fedora %{git_rev} +git checkout -b %{main_version}-fedora %{git_rev} cp -a [A-Z]* .. cp -a data/ .. @@ -176,7 +181,7 @@ done %endif git config user.name "lxpanel Fedora maintainer" -git config user.email "lxpanel-owner@fedoraproject.org" +git config user.email "lxpanel-maintainers@fedoraproject.org" %if 0%{?use_release} || 0%{?use_git} git add . @@ -268,28 +273,39 @@ cd .. %files -f %{name}.lang -%doc AUTHORS ChangeLog COPYING README data/desktop.conf.example +%doc AUTHORS +%doc ChangeLog +%license COPYING +%doc README +%doc data/desktop.conf.example + %{_bindir}/%{name} %{_bindir}/%{name}-logout %{_bindir}/%{name}-db %{_bindir}/%{name}-default %{_bindir}/%{name}-default-apps %{_bindir}/%{name}-default-terminal -%dir %{_libexecdir}/%{name} + +%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/%{name}-xsettings + %{_bindir}/lxsettings-daemon %{_bindir}/%{name}-xdg-autostart %{_bindir}/lxlock %{_bindir}/lxclipboard -%{_datadir}/%{name}/ -%exclude %{_datadir}/%{name}/ui/lxpolkit.ui -%exclude %{_datadir}/%{name}/ui/lxsession-edit.ui -%{_mandir}/man*/%{name}*.* -# we need to own -%dir %{_sysconfdir}/xdg/%{name} + +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/images/ +%dir %{_datadir}/%{name}/ui/ +%{_datadir}/%{name}/ui/lxsession-default-apps.ui %{_datadir}/applications/lxsession-default-apps.desktop +# we need to own +%dir %{_sysconfdir}/xdg/%{name} + + +%{_mandir}/man*/%{name}*.* %{_mandir}/man1/lxlock.1* %{_mandir}/man1/lxpolkit.1* %{_mandir}/man1/lxclipboard.1* @@ -302,7 +318,7 @@ cd .. %files -n lxpolkit %{_bindir}/lxpolkit -%config %{_sysconfdir}/xdg/autostart/lxpolkit.desktop +%{_sysconfdir}/xdg/autostart/lxpolkit.desktop %{_datadir}/%{name}/ui/lxpolkit.ui %changelog From bdb64b2f3a9b6bb5a0735dff3a34af4581385e6e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Aug 2023 14:30:04 +0900 Subject: [PATCH 12/25] Update to the latest git --- ...utostart-never-reuse-GKeyFile-object.patch | 54 ------------------- ...utostart-never-reuse-GKeyFile-object.patch | 50 ----------------- ...read_autostart_conf-create-directory.patch | 47 ---------------- lxsession.spec | 23 +++----- sources | 2 +- 5 files changed, 8 insertions(+), 168 deletions(-) delete mode 100644 lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch delete mode 100644 lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.patch delete mode 100644 lxsession-0.5.5-read_autostart_conf-create-directory.patch diff --git a/lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch b/lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch deleted file mode 100644 index 07c52c3..0000000 --- a/lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 542069fede56b083d436c394357d1ddf1fd44dec Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sat, 13 Mar 2021 01:11:13 +0900 -Subject: [PATCH] xdg-autostart: never reuse GKeyFile object - -As written on: -https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html#g-key-file-load-from-file -an empty GKeyFile object must be passed to g_key_file_load_from_file . ---- - xdg-autostart/xdg-autostart.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xdg-autostart/xdg-autostart.c b/xdg-autostart/xdg-autostart.c -index 460d4f6..9c9317d 100644 ---- a/xdg-autostart/xdg-autostart.c -+++ b/xdg-autostart/xdg-autostart.c -@@ -175,7 +175,7 @@ _finish: - } - #endif - --static void launch_autostart_file( const char* desktop_id, const char* desktop_file, GKeyFile* kf) -+static void launch_autostart_file_internal( const char* desktop_id, const char* desktop_file, GKeyFile* kf) - { - if( g_key_file_load_from_file( kf, desktop_file, 0, NULL ) ) - { -@@ -266,6 +266,14 @@ static void launch_autostart_file( const char* desktop_id, const char* desktop_f - } - } - -+static void launch_autostart_file( const char* desktop_id, const char* desktop_file ) -+{ -+ GKeyFile* kf = g_key_file_new(); -+ launch_autostart_file_internal( desktop_id, desktop_file, kf ); -+ g_key_file_free( kf ); -+} -+ -+ - static void get_autostart_files_in_dir( GHashTable* hash, const char* base_dir ) - { - char* dir_path = g_build_filename( base_dir, "autostart", NULL ); -@@ -313,9 +321,7 @@ void xdg_autostart( const char* de_name_arg ) - - if( g_hash_table_size( hash ) > 0 ) - { -- GKeyFile* kf = g_key_file_new(); -- g_hash_table_foreach( hash, (GHFunc)launch_autostart_file, kf); -- g_key_file_free( kf ); -+ g_hash_table_foreach( hash, (GHFunc)launch_autostart_file, NULL ); - } - - g_hash_table_destroy( hash ); --- -2.30.2 - diff --git a/lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.patch b/lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.patch deleted file mode 100644 index 035dc85..0000000 --- a/lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5d2d43b1189a52aa5a98d93496f71f0348729b0e Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sat, 20 Mar 2021 23:45:09 +0900 -Subject: [PATCH] load_autostart: never reuse GKeyFile object - -As written on: -https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html#g-key-file-load-from-file -an empty GKeyFile object must be passed to g_key_file_load_from_file . ---- - lxsession-edit/lxsession-edit-common.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lxsession-edit/lxsession-edit-common.c b/lxsession-edit/lxsession-edit-common.c -index 3de3dbb..019416d 100644 ---- a/lxsession-edit/lxsession-edit-common.c -+++ b/lxsession-edit/lxsession-edit-common.c -@@ -136,9 +136,10 @@ void get_autostart_files_in_dir( GHashTable* hash, const char* session_name, con - g_free( dir_path ); - } - --void add_autostart_file(char* desktop_id, char* file, GKeyFile* kf) -+void add_autostart_file(char* desktop_id, char* file ) - { - GtkTreeIter it; -+ GKeyFile* kf = g_key_file_new(); - - const char* session_name_local = NULL; - -@@ -176,6 +177,7 @@ void add_autostart_file(char* desktop_id, char* file, GKeyFile* kf) - g_free(comment); - } - } -+ g_key_file_free( kf ); - } - - void load_autostart(const char* session_name) -@@ -193,9 +195,7 @@ void load_autostart(const char* session_name) - - if( g_hash_table_size( hash ) > 0 ) - { -- GKeyFile* kf = g_key_file_new(); -- g_hash_table_foreach( hash, (GHFunc)add_autostart_file, kf ); -- g_key_file_free( kf ); -+ g_hash_table_foreach( hash, (GHFunc)add_autostart_file, NULL ); - } - g_hash_table_destroy( hash ); - } --- -2.30.2 - diff --git a/lxsession-0.5.5-read_autostart_conf-create-directory.patch b/lxsession-0.5.5-read_autostart_conf-create-directory.patch deleted file mode 100644 index 1867fb8..0000000 --- a/lxsession-0.5.5-read_autostart_conf-create-directory.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- lxsession-0.5.5/lxsession-default-apps/autostart.vala.conf_noexist 2023-06-12 15:52:43.574275326 +0900 -+++ lxsession-0.5.5/lxsession-default-apps/autostart.vala 2023-06-12 15:58:54.735990230 +0900 -@@ -23,6 +23,24 @@ namespace LDefaultApps - string config_path; - config_path = get_config_home_path("autostart"); - var config_file = File.new_for_path (config_path); -+ -+ /* Make it sure that parent directory for config_file always exists */ -+ { -+ var config_parent = config_file.get_parent(); -+ -+ if (!config_parent.query_exists ()) -+ { -+ try -+ { -+ config_parent.make_directory_with_parents (); -+ } -+ catch (GLib.Error e) -+ { -+ message (e.message); -+ } -+ } -+ } -+ - if (!config_file.query_exists ()) - { - string config_system_path; -@@ -45,19 +63,6 @@ namespace LDefaultApps - else - { - File file = File.new_for_path (config_system_path); -- var config_parent = config_file.get_parent(); -- -- if (!config_parent.query_exists ()) -- { -- try -- { -- config_parent.make_directory_with_parents (); -- } -- catch (GLib.Error e) -- { -- message (e.message); -- } -- } - - try - { diff --git a/lxsession.spec b/lxsession.spec index 86d8b6f..56f3194 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -25,11 +25,11 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20220913 -%global gittartime 1507 +%global gittardate 20230815 +%global gittartime 1413 -%global gitbaredate 20210419 -%global git_rev 82580e4559e034d1879071baae152a699f5aa1b0 +%global gitbaredate 20230810 +%global git_rev 27c1eaf63019da8b67634a9b0f3623800e79f88a %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -64,12 +64,6 @@ Source0: %{name}-%{version}-%{?git_version}.tar.bz2 %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif -# https://github.com/lxde/lxsession/pull/27 -# Fix lxsession-xdg-autostart segfault -Patch1: lxsession-0.5.5-0001-xdg-autostart-never-reuse-GKeyFile-object.patch -# https://github.com/lxde/lxsession/pull/28 -# Fix lxsession-default-apps segfault -Patch2: lxsession-0.5.5-0002-load_autostart-never-reuse-GKeyFile-object.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 @@ -77,9 +71,6 @@ Patch1002: lxsession-0.5.2-notify-daemon-default.patch # race condition when calling "lxsession -r" from imsettings-lxde and when daemon is not configured yet # explicitly do nullptr check Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2213030 -# Always create parent directory for lxsession autostart file -Patch1006: lxsession-0.5.5-read_autostart_conf-create-directory.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1830588 # add custom directory to XDG_CONFIG_DIRS Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch @@ -189,12 +180,9 @@ git commit -m "base" -q %endif #%patch0 -p1 -b .dsofix -%__cat %PATCH1 | git am -%__cat %PATCH2 | git am %patch -P1000 -p1 -b .reload %patch -P1002 -p1 -b .notify %patch -P1005 -p1 -b .nullcheck -%patch -P1006 -p1 -b .conf_noexist %patch -P2001 -p1 -b .custom %patch -P2002 -p1 -b .indicator %if 0%{?use_gitbare} @@ -322,6 +310,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Tue Aug 15 2023 Mamoru TASAKA - 0.5.5^20230810git27c1eaf6-1 +- Update to the latest git + * Thu Jul 20 2023 Fedora Release Engineering - 0.5.5-11.D20210419git82580e45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 770e48b..ec9a42d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20220913T1507.tar.gz) = 54ca0362e6b0998aad8dba6e60b8f3ecb44f356bcc3c04f1a6942daf0355f58011947afe3bc116f51827ebc6698efe1c16a0c227c8bd0b77d11aac98cc297aba +SHA512 (lxsession-20230815T1413.tar.gz) = 5eff576cfb7078b6d71625cb322b11e9627c643d3cb03aabfbd2121731d5755a4918e99163275cc95b873e67696b6bbb1fd8fcc9721c65c654d8ed54c50d5c6c From aef7afccd623ada0e3186cd8d1d2a2fd3817199b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Dec 2023 12:12:36 +0900 Subject: [PATCH 13/25] Remove no longer used conditional --- lxsession.spec | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index 56f3194..e5c80a8 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -3,27 +3,17 @@ # 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 @@ -32,9 +22,7 @@ %global git_rev 27c1eaf63019da8b67634a9b0f3623800e79f88a %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} -%endif -%if 0%{?use_git} || 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif @@ -58,9 +46,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 @@ -145,7 +130,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 @@ -174,7 +159,7 @@ done 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 From 36c87606242d4a5c04afe7959440331012a0712d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Dec 2023 12:24:06 +0900 Subject: [PATCH 14/25] Update to the latest git --- lxsession.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index e5c80a8..77fad92 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -15,11 +15,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230815 -%global gittartime 1413 +%global gittardate 20231231 +%global gittartime 1207 -%global gitbaredate 20230810 -%global git_rev 27c1eaf63019da8b67634a9b0f3623800e79f88a +%global gitbaredate 20230917 +%global git_rev e0fffa6645f7c8b1ee9ea1088acd051ba8e733d4 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -295,6 +295,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Sun Dec 31 2023 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-1 +- Update to the latest git + * Tue Aug 15 2023 Mamoru TASAKA - 0.5.5^20230810git27c1eaf6-1 - Update to the latest git diff --git a/sources b/sources index ec9a42d..f6b4579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20230815T1413.tar.gz) = 5eff576cfb7078b6d71625cb322b11e9627c643d3cb03aabfbd2121731d5755a4918e99163275cc95b873e67696b6bbb1fd8fcc9721c65c654d8ed54c50d5c6c +SHA512 (lxsession-20231231T1207.tar.gz) = a8a144fdfb4808d4cf82a4bea0926052f754f1be4c3f934f203a67b8a49856eca683cc0300d48710256bdc1642e191c01eae8dd0ef4c6fbd5743a80769e86444 From 278ae10ee1d4ee8b96f347ab52f6e3544e331828 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Jan 2024 19:30:24 +0900 Subject: [PATCH 15/25] Change -Wincompatible-pointer-types from error to warning --- lxsession.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index 77fad92..b05c5a3 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + # review https://bugzilla.redhat.com/show_bug.cgi?id=502404 # renamed from lxsession-lite. Original review at # https://bugzilla.redhat.com/show_bug.cgi?id=442268 @@ -32,7 +35,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -295,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-2 +- Change -Wincompatible-pointer-types from error to warning + * Sun Dec 31 2023 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-1 - Update to the latest git From 756d4a0856a1fa8f26783983a0624434bf78d100 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:30:31 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index b05c5a3..4cfd873 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -35,7 +35,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -298,6 +298,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.5.5^20230917gite0fffa66-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-2 - Change -Wincompatible-pointer-types from error to warning From 0dca476d3503c720d6d8801c6c0722d80b963f75 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Feb 2024 17:06:37 +0900 Subject: [PATCH 17/25] Apply upstream PR for gcc14 -Werror=incompatible-pointer-types --- ...fix-gcc14-incompatible-pointer-types.patch | 89 +++++++++++++++++++ lxsession.spec | 12 ++- 2 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch diff --git a/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch b/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch new file mode 100644 index 0000000..5e612ed --- /dev/null +++ b/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch @@ -0,0 +1,89 @@ +From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +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/lxsession.spec b/lxsession.spec index 4cfd873..99286d5 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - # review https://bugzilla.redhat.com/show_bug.cgi?id=502404 # renamed from lxsession-lite. Original review at # https://bugzilla.redhat.com/show_bug.cgi?id=442268 @@ -35,7 +32,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -52,6 +49,9 @@ 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 @@ -168,6 +168,7 @@ 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 @@ -298,6 +299,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Sun Feb 25 2024 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-4 +- Apply upstream PR for gcc14 -Werror=incompatible-pointer-types + * Thu Jan 25 2024 Fedora Release Engineering - 0.5.5^20230917gite0fffa66-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49a548872eea268b78e484bcd2a967a25710fa8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:29:12 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index 99286d5..b668bec 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -32,7 +32,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -299,6 +299,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.5.5^20230917gite0fffa66-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Feb 25 2024 Mamoru TASAKA - 0.5.5^20230917gite0fffa66-4 - Apply upstream PR for gcc14 -Werror=incompatible-pointer-types From ceaaf2df28c3155997655815e9fb31ab8ef6f7a8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Aug 2024 14:34:53 +0900 Subject: [PATCH 19/25] Update to the latest git --- ...fix-gcc14-incompatible-pointer-types.patch | 89 ------------------- lxsession.spec | 17 ++-- sources | 2 +- 3 files changed, 9 insertions(+), 99 deletions(-) delete mode 100644 lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch diff --git a/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch b/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch deleted file mode 100644 index 5e612ed..0000000 --- a/lxsession-pr34-fix-gcc14-incompatible-pointer-types.patch +++ /dev/null @@ -1,89 +0,0 @@ -From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -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/lxsession.spec b/lxsession.spec index b668bec..2748f5b 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -15,11 +15,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20231231 -%global gittartime 1207 +%global gittardate 20240813 +%global gittartime 1415 -%global gitbaredate 20230917 -%global git_rev e0fffa6645f7c8b1ee9ea1088acd051ba8e733d4 +%global gitbaredate 20240812 +%global git_rev 626a654b55553b88f7356fa07974c88b5963fc5e %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -32,7 +32,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -49,9 +49,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 @@ -168,7 +165,6 @@ 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 @@ -299,6 +295,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Tue Aug 13 2024 Mamoru TASAKA - 0.5.5^20240812git626a654b-1 +- Update to the latest git + * Thu Jul 18 2024 Fedora Release Engineering - 0.5.5^20230917gite0fffa66-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index f6b4579..bdb780b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20231231T1207.tar.gz) = a8a144fdfb4808d4cf82a4bea0926052f754f1be4c3f934f203a67b8a49856eca683cc0300d48710256bdc1642e191c01eae8dd0ef4c6fbd5743a80769e86444 +SHA512 (lxsession-20240813T1415.tar.gz) = 56a813ed58ae78e5468454068ce508cce712ff94dacf99c01118566d312210fd2c687ddf2a917ce151bd89530eed6b7466096eac19d9ca0191372169039073fb From 18e8a1e5ab1ed8a1f2641493fa2cd5307a83b6fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 16:50:24 +0900 Subject: [PATCH 20/25] Update to the latest git Update to the latest git Update to the latest git --- lxsession.spec | 20 ++++++++++++++++---- sources | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index 2748f5b..51b8938 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -15,11 +15,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240813 -%global gittartime 1415 +%global gittardate 20240825 +%global gittartime 1603 -%global gitbaredate 20240812 -%global git_rev 626a654b55553b88f7356fa07974c88b5963fc5e +%global gitbaredate 20240821 +%global git_rev 95e902d76758e09f9226abd39163aadd5cd50bc1 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -154,6 +154,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" @@ -295,6 +304,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Sun Aug 25 2024 Mamoru TASAKA - 0.5.5^20240821git95e902d7-1 +- Update to the latest git + * Tue Aug 13 2024 Mamoru TASAKA - 0.5.5^20240812git626a654b-1 - Update to the latest git diff --git a/sources b/sources index bdb780b..578ba0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20240813T1415.tar.gz) = 56a813ed58ae78e5468454068ce508cce712ff94dacf99c01118566d312210fd2c687ddf2a917ce151bd89530eed6b7466096eac19d9ca0191372169039073fb +SHA512 (lxsession-20240825T1603.tar.gz) = 46b87840f891542658d0f35028ae4d9ab802f493841351ffa0b886f67a828529884eb1e1b2294876ecbc81187b8cbbec3d816fde2697969d09b052193f8ab5ba From 194b4fab1fe5f86d6a5ade344f08ed4d1e54f7fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:35:52 +0000 Subject: [PATCH 21/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index 51b8938..8af2ef7 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -32,7 +32,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -304,6 +304,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.5.5^20240821git95e902d7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Aug 25 2024 Mamoru TASAKA - 0.5.5^20240821git95e902d7-1 - Update to the latest git From fe29e221e748a7307a76e0c709533c5e534a45b1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 00:07:05 +0900 Subject: [PATCH 22/25] update to the latest git --- lxsession.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index 8af2ef7..f638783 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -15,11 +15,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240825 -%global gittartime 1603 +%global gittardate 20250213 +%global gittartime 2350 -%global gitbaredate 20240821 -%global git_rev 95e902d76758e09f9226abd39163aadd5cd50bc1 +%global gitbaredate 20241019 +%global git_rev c72db4f8c06c2d6be6dcb13fad838f619f51f8a7 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -32,7 +32,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -304,6 +304,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Feb 13 2025 Mamoru TASAKA - 0.5.5^20241019gitc72db4f8-1 +- Update to the latest git + * Fri Jan 17 2025 Fedora Release Engineering - 0.5.5^20240821git95e902d7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 578ba0b..a2751bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20240825T1603.tar.gz) = 46b87840f891542658d0f35028ae4d9ab802f493841351ffa0b886f67a828529884eb1e1b2294876ecbc81187b8cbbec3d816fde2697969d09b052193f8ab5ba +SHA512 (lxsession-20250213T2350.tar.gz) = d89b5fb03808a68210b8efb8502d1ace07c90059a20ae0eb2dbc316b273eb2bb871b842fdd9fb65c88e60f03e46bfe2d525d7ba5cf3cea8a3faf54fe4f6043a8 From 1a5fceb139f1575a8b003e6e4c7b62ebbf328b90 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 3 Apr 2025 16:20:32 +0900 Subject: [PATCH 23/25] 0.5.6 --- lxsession.spec | 16 +++++++++++----- sources | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lxsession.spec b/lxsession.spec index f638783..f1a9947 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -15,20 +15,23 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250213 -%global gittartime 2350 +%global gittardate 20250403 +%global gittartime 1600 +%define use_gitcommit_as_rel 0 -%global gitbaredate 20241019 -%global git_rev c72db4f8c06c2d6be6dcb13fad838f619f51f8a7 +%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} @@ -304,6 +307,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Apr 03 2025 Mamoru TASAKA - 0.5.6-1 +- 0.5.6 + * Thu Feb 13 2025 Mamoru TASAKA - 0.5.5^20241019gitc72db4f8-1 - Update to the latest git diff --git a/sources b/sources index a2751bb..8208941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxsession-20250213T2350.tar.gz) = d89b5fb03808a68210b8efb8502d1ace07c90059a20ae0eb2dbc316b273eb2bb871b842fdd9fb65c88e60f03e46bfe2d525d7ba5cf3cea8a3faf54fe4f6043a8 +SHA512 (lxsession-20250403T1600.tar.gz) = b3282ea072d3cf2552c9581cca8251f9f7b2f7c7e062b4a9ee4d9725ab2218f35dd437beab53d56417b94a036d428cfe196b58a0e9af73d33f295bbefd938a5e From 6f6c0578a79b97db528bb952b5e703e5cbacb8f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:08:18 +0000 Subject: [PATCH 24/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lxsession.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxsession.spec b/lxsession.spec index f1a9947..e75d559 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -35,7 +35,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -307,6 +307,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Apr 03 2025 Mamoru TASAKA - 0.5.6-1 - 0.5.6 From 0cccf489d8885983d2f41b6c09c5f3d3185258fe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Aug 2025 21:04:10 +0900 Subject: [PATCH 25/25] Add workaround for setting a11y bus explicitly --- ...sion-workaround-for-setting-ally-bus.patch | 26 +++++++++++++++++++ lxsession.spec | 10 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch diff --git a/lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch b/lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch new file mode 100644 index 0000000..6735a05 --- /dev/null +++ b/lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch @@ -0,0 +1,26 @@ +From e935beaa73f30dd54253f96ca951a4b47fc9a3b7 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +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 + diff --git a/lxsession.spec b/lxsession.spec index e75d559..7228ca7 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -35,7 +35,7 @@ Name: lxsession Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight X11 session manager Summary(de): Leichtgewichtiger X11 Sitzungsverwalter @@ -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) @@ -182,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 @@ -307,6 +312,9 @@ cd .. %{_datadir}/%{name}/ui/lxpolkit.ui %changelog +* Fri Aug 15 2025 Mamoru TASAKA - 0.5.6-3 +- Add workaround for setting a11y bus explicitly + * Thu Jul 24 2025 Fedora Release Engineering - 0.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild