From 1aa3d4b377e8b3abf01d6a57682d3fb86e6e1e6e3ecd2410cca840b23025747b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 15 Aug 2025 11:59:17 +0200 Subject: [PATCH 1/2] Update to version 4.20.3 * wayland: startxfce4: Remove definition of SDL_VIDEODRIVER variable * Add xapp for Settings in xfce-portals.conf * startxfce4: Add check for /etc/vconsole.conf * labwc: Add some default config values * xfce-portals.conf: Add wlr for ScreenCast * startxfce4: Improve keyboard layout detection on wayland * wayland: start a D-Bus session only if there isn't one already * Use syntax compatible with most sh shells. * labwc: Add window snapping range --- xfce4-session-4.20.2.tar.bz2 | 3 --- xfce4-session-4.20.3.tar.bz2 | 3 +++ xfce4-session.changes | 14 ++++++++++++++ xfce4-session.spec | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) delete mode 100644 xfce4-session-4.20.2.tar.bz2 create mode 100644 xfce4-session-4.20.3.tar.bz2 diff --git a/xfce4-session-4.20.2.tar.bz2 b/xfce4-session-4.20.2.tar.bz2 deleted file mode 100644 index 9d233b8..0000000 --- a/xfce4-session-4.20.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0b80b7136515bc3c0c54fa859ad420365e29b715b6da0b58a2d2781bfbe73c3 -size 1226931 diff --git a/xfce4-session-4.20.3.tar.bz2 b/xfce4-session-4.20.3.tar.bz2 new file mode 100644 index 0000000..c97b346 --- /dev/null +++ b/xfce4-session-4.20.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbf00672c5316a30b7001fe852e6a5ba9f889afeab8a247545a160d4302f1fa2 +size 1233244 diff --git a/xfce4-session.changes b/xfce4-session.changes index 558e3c7..fdbb218 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Aug 14 13:45:06 UTC 2025 - Manfred Hollstein + +- Update to version 4.20.3: + * wayland: startxfce4: Remove definition of SDL_VIDEODRIVER variable + * Add xapp for Settings in xfce-portals.conf + * startxfce4: Add check for /etc/vconsole.conf + * labwc: Add some default config values + * xfce-portals.conf: Add wlr for ScreenCast + * startxfce4: Improve keyboard layout detection on wayland + * wayland: start a D-Bus session only if there isn't one already + * Use syntax compatible with most sh shells. + * labwc: Add window snapping range + ------------------------------------------------------------------- Tue Aug 5 13:41:07 UTC 2025 - Takashi Iwai diff --git a/xfce4-session.spec b/xfce4-session.spec index 01dab3e..efec9d8 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -18,7 +18,7 @@ %bcond_with git Name: xfce4-session -Version: 4.20.2 +Version: 4.20.3 Release: 0 Summary: Xfce Session Manager License: GPL-2.0-only -- 2.51.1 From 193ad3bce56e19a5455d0614c3d161d1607ded0d66510abb346234d0951855fb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 15 Aug 2025 11:59:40 +0200 Subject: [PATCH 2/2] Reduce the timeout for auto-start on Wayland (bsc#1247542) This is a temporary workaround for the too slow start-up on Wayland desktop. Currently the error is ignored in anyway. Use '?' for SUSE macro expansion, so that quilt setup works. --- ...ssion-reduce-wayland-autostart-timeout.patch | 17 +++++++++++++++++ xfce4-session.changes | 9 +++++++++ xfce4-session.spec | 6 ++++-- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 xfce4-session-reduce-wayland-autostart-timeout.patch diff --git a/xfce4-session-reduce-wayland-autostart-timeout.patch b/xfce4-session-reduce-wayland-autostart-timeout.patch new file mode 100644 index 0000000..b409748 --- /dev/null +++ b/xfce4-session-reduce-wayland-autostart-timeout.patch @@ -0,0 +1,17 @@ +A temporary workaround for the too slow start up in Wayland mode (bsc#1247542) +--- + xfce4-session/xfsm-manager.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/xfce4-session/xfsm-manager.h ++++ b/xfce4-session/xfsm-manager.h +@@ -40,7 +40,8 @@ G_BEGIN_DECLS + #define DIE_TIMEOUT (7 * 1000) + #define SAVE_TIMEOUT (60 * 1000) + #define STARTUP_TIMEOUT (8 * 1000) +-#define STARTUP_TIMEOUT_WAYLAND (8 * 1000) ++// FIXME: reduced to 500ms for Wayland, otherwise it takes ages at startup ++#define STARTUP_TIMEOUT_WAYLAND 500 + #define RESTART_RESET_TIMEOUT (5 * 60 * 1000) + #define XFSM_CHOOSE_LOGOUT 0 + #define XFSM_CHOOSE_LOAD 1 diff --git a/xfce4-session.changes b/xfce4-session.changes index fdbb218..efde76d 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Aug 14 14:46:12 UTC 2025 - Takashi Iwai + +- Reduce the timeout for auto-start on Wayland (bsc#1247542); + xfce4-session-reduce-wayland-autostart-timeout.patch + This is a temporary workaround for the too slow start-up on Wayland + desktop. Currently the error is ignored in anyway. +- Use '?' for SUSE macro expansion, so that quilt setup works. + ------------------------------------------------------------------- Thu Aug 14 13:45:06 UTC 2025 - Manfred Hollstein diff --git a/xfce4-session.spec b/xfce4-session.spec index efec9d8..2fb3a11 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -38,6 +38,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch Patch2: 0002-relax-x11-version.patch # PATCH-FIX-OPENSUSE xfce4-session-drop-amixer-D-pulse-option.patch -- Fix audio mixer invocation on Wayland Patch3: xfce4-session-drop-amixer-D-pulse-option.patch +# PATCH-FIX-OPENSUSE xfce4-session-reduce-wayland-autostart-timeout.patch -- Fix the too slow start-up on Wayland +Patch4: xfce4-session-reduce-wayland-autostart-timeout.patch BuildRequires: fdupes BuildRequires: gettext >= 0.19.8 BuildRequires: iceauth @@ -103,7 +105,7 @@ BuildArch: noarch %description branding-upstream This package provides the upstream look and feel for the Xfce Session Manager. -%if 0%{is_opensuse} && 0%{suse_version} >= 1550 +%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550 %package wayland-experimental Summary: Xfce Session Manager for Wayland Group: System/GUI/XFCE @@ -213,7 +215,7 @@ rmdir %{buildroot}%{_datadir}/wayland-sessions %files branding-upstream %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml -%if 0%{is_opensuse} && 0%{suse_version} >= 1550 +%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550 %files wayland-experimental %dir %{_datadir}/wayland-sessions %{_datadir}/wayland-sessions/xfce-wayland.desktop -- 2.51.1