1
0
forked from pool/xfce4-session

11 Commits

Author SHA256 Message Date
815d7e8546 Accepting request 1298143 from X11:xfce
OBS-URL: https://build.opensuse.org/request/show/1298143
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=96
2025-08-07 14:50:01 +00:00
ba13c201e5 - Fix the audio mixer invocation on Wayland (bsc#1247640):
xfce4-session-drop-amixer-D-pulse-option.patch

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=176
2025-08-07 12:47:53 +00:00
f5c8da088f Accepting request 1292361 from X11:xfce
OBS-URL: https://build.opensuse.org/request/show/1292361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=95
2025-07-14 08:49:06 +00:00
f6522e767d - Fix entries in .changes file
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=174
2025-07-12 13:49:55 +00:00
3d5ce8c049 Accepting request 1265579 from X11:xfce
OBS-URL: https://build.opensuse.org/request/show/1265579
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=94
2025-03-31 09:43:46 +00:00
87cc2494c1 - Build sub-package wayland-experimental only on Tumbleweed or
Slowroll; Leap does not provide labwc (yet).

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=172
2025-03-30 15:53:43 +00:00
5377e6ea4d Accepting request 1256328 from X11:xfce
OBS-URL: https://build.opensuse.org/request/show/1256328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=93
2025-03-27 21:32:08 +00:00
67434f5615 - Update to version 4.20.2:
* build: Fix include order on *BSD
  * autotools-build: Be sure gdbus-codegen files are regenerated
- Remove obsolete 0003-fix-glib2_84-related-conditionals.patch

- Update to version 4.20.1:
  * wayland: Use labwc's --session option if available
  * wayland: Don't pass xfce4-session to the optional compositor
    cmdline
  * build: Add missing dep flags
  * build: Automate copyright year management
  * build: Replace xdt-csource with glib-compile-resources
  * build: Define xfce4 min version >= 4.18
  * scripts: Make xflock4 blocking again
  * startxfce4: Fix keyboard layout on wayland
  * scripts: Remove unused .in level in xinitrc
  * build: Add missing checks for headers
  * build: Fix wrong include guard
  * build: Add missing check for sigprocmask
  * autotools-build: Check for xfce4-dev-tools in configure.ac
  * build: Add missing dep flags
  * build: Get rid of maintainer mode where gdbus-codegen is used
  * Improve Wayland support
  * Translation Updates
- Refresh xfce4-session-adapt-session-scripts-git.patch and
  xfce4-session-adapt-session-scripts.patch
- Refresh 0002-relax-x11-version.patch
  * Add small hack to maintain the configure* files' modification
    time; otherwise the whole aclocal, autoconf, automake series
    will have to be run, which will fail.
- Add 0003-fix-glib2_84-related-conditionals.patch to fix errors
  when building with glib2 < 2.84

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=170
2025-03-26 21:31:37 +00:00
d27a670a4d Accepting request 1233531 from X11:xfce
New Xfce version 4.20

OBS-URL: https://build.opensuse.org/request/show/1233531
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=92
2024-12-31 10:12:39 +00:00
c716969357 - Add xwayland as a required package for the new subpackage
xfce4-session-wayland-experimental

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=168
2024-12-20 18:19:29 +00:00
f49e320df5 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=167 2024-12-17 07:25:36 +00:00
8 changed files with 454 additions and 110 deletions

View File

@@ -0,0 +1,237 @@
diff -rup a/configure.ac b/configure.ac
--- a/configure.ac 2025-03-23 09:09:17.000000000 +0100
+++ b/configure.ac 2025-03-23 11:43:49.616995147 +0100
@@ -19,8 +19,8 @@ m4_define([libxfce4windowing_min_version
m4_define([libx11_min_version], [1.6.7])
m4_define([libwnck_min_version], [3.10.0])
-m4_define([libice_min_version], [1.0.10])
-m4_define([libsm_min_version], [1.2.3])
+m4_define([libice_min_version], [1.0.9])
+m4_define([libsm_min_version], [1.2.2])
m4_define([gtk_layer_shell_min_version], [0.7.0])
diff -rup a/configure b/configure
--- a/configure 2025-03-23 09:11:01.000000000 +0100
+++ b/configure 2025-03-23 11:44:06.375181485 +0100
@@ -20785,11 +20785,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
- if ! $PKG_CONFIG --exists "ice >= 1.0.10" >/dev/null 2>&1; then
+ if ! $PKG_CONFIG --exists "ice >= 1.0.9" >/dev/null 2>&1; then
if test x"$xdt_feature_deps_missing" = x""; then
- xdt_feature_deps_missing="ice >= 1.0.10"
+ xdt_feature_deps_missing="ice >= 1.0.9"
else
- xdt_feature_deps_missing="$xdt_feature_deps_missing, ice >= 1.0.10"
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, ice >= 1.0.9"
fi
fi
else
@@ -20948,9 +20948,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ice >= 1.0.10" >&5
-printf %s "checking for ice >= 1.0.10... " >&6; }
- if $PKG_CONFIG "--atleast-version=1.0.10" "ice" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ice >= 1.0.9" >&5
+printf %s "checking for ice >= 1.0.9... " >&6; }
+ if $PKG_CONFIG "--atleast-version=1.0.9" "ice" >/dev/null 2>&1; then
LIBICE_VERSION=`$PKG_CONFIG --modversion "ice"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_VERSION" >&5
printf "%s\n" "$LIBICE_VERSION" >&6; }
@@ -20967,7 +20967,7 @@ printf %s "checking LIBICE_LIBS... " >&6
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_LIBS" >&5
printf "%s\n" "$LIBICE_LIBS" >&6; }
- LIBICE_REQUIRED_VERSION=1.0.10
+ LIBICE_REQUIRED_VERSION=1.0.9
@@ -20996,7 +20996,7 @@ printf "%s\n" "found, but $xdt_cv_versio
echo "*** The required package ice was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade ice to atleast version 1.0.10, or adjust"
+ echo "*** Please upgrade ice to atleast version 1.0.9, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -21008,7 +21008,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package ice was not found on your system."
- echo "*** Please install ice (atleast version 1.0.10) or adjust"
+ echo "*** Please install ice (atleast version 1.0.9) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -21022,11 +21022,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
- if ! $PKG_CONFIG --exists "sm >= 1.2.3" >/dev/null 2>&1; then
+ if ! $PKG_CONFIG --exists "sm >= 1.2.2" >/dev/null 2>&1; then
if test x"$xdt_feature_deps_missing" = x""; then
- xdt_feature_deps_missing="sm >= 1.2.3"
+ xdt_feature_deps_missing="sm >= 1.2.2"
else
- xdt_feature_deps_missing="$xdt_feature_deps_missing, sm >= 1.2.3"
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, sm >= 1.2.2"
fi
fi
else
@@ -21185,9 +21185,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sm >= 1.2.3" >&5
-printf %s "checking for sm >= 1.2.3... " >&6; }
- if $PKG_CONFIG "--atleast-version=1.2.3" "sm" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sm >= 1.2.2" >&5
+printf %s "checking for sm >= 1.2.2... " >&6; }
+ if $PKG_CONFIG "--atleast-version=1.2.2" "sm" >/dev/null 2>&1; then
LIBSM_VERSION=`$PKG_CONFIG --modversion "sm"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_VERSION" >&5
printf "%s\n" "$LIBSM_VERSION" >&6; }
@@ -21204,7 +21204,7 @@ printf %s "checking LIBSM_LIBS... " >&6;
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_LIBS" >&5
printf "%s\n" "$LIBSM_LIBS" >&6; }
- LIBSM_REQUIRED_VERSION=1.2.3
+ LIBSM_REQUIRED_VERSION=1.2.2
@@ -21233,7 +21233,7 @@ printf "%s\n" "found, but $xdt_cv_versio
echo "*** The required package sm was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade sm to atleast version 1.2.3, or adjust"
+ echo "*** Please upgrade sm to atleast version 1.2.2, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -21245,7 +21245,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package sm was not found on your system."
- echo "*** Please install sm (atleast version 1.2.3) or adjust"
+ echo "*** Please install sm (atleast version 1.2.2) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -21974,11 +21974,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
- if ! $PKG_CONFIG --exists "ice >= 1.0.10" >/dev/null 2>&1; then
+ if ! $PKG_CONFIG --exists "ice >= 1.0.9" >/dev/null 2>&1; then
if test x"$xdt_feature_deps_missing" = x""; then
- xdt_feature_deps_missing="ice >= 1.0.10"
+ xdt_feature_deps_missing="ice >= 1.0.9"
else
- xdt_feature_deps_missing="$xdt_feature_deps_missing, ice >= 1.0.10"
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, ice >= 1.0.9"
fi
fi
else
@@ -22137,9 +22137,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ice >= 1.0.10" >&5
-printf %s "checking for ice >= 1.0.10... " >&6; }
- if $PKG_CONFIG "--atleast-version=1.0.10" "ice" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ice >= 1.0.9" >&5
+printf %s "checking for ice >= 1.0.9... " >&6; }
+ if $PKG_CONFIG "--atleast-version=1.0.9" "ice" >/dev/null 2>&1; then
LIBICE_VERSION=`$PKG_CONFIG --modversion "ice"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_VERSION" >&5
printf "%s\n" "$LIBICE_VERSION" >&6; }
@@ -22156,7 +22156,7 @@ printf %s "checking LIBICE_LIBS... " >&6
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_LIBS" >&5
printf "%s\n" "$LIBICE_LIBS" >&6; }
- LIBICE_REQUIRED_VERSION=1.0.10
+ LIBICE_REQUIRED_VERSION=1.0.9
@@ -22185,7 +22185,7 @@ printf "%s\n" "found, but $xdt_cv_versio
echo "*** The required package ice was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade ice to atleast version 1.0.10, or adjust"
+ echo "*** Please upgrade ice to atleast version 1.0.9, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -22197,7 +22197,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package ice was not found on your system."
- echo "*** Please install ice (atleast version 1.0.10) or adjust"
+ echo "*** Please install ice (atleast version 1.0.9) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."
@@ -22211,11 +22211,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
- if ! $PKG_CONFIG --exists "sm >= 1.2.3" >/dev/null 2>&1; then
+ if ! $PKG_CONFIG --exists "sm >= 1.2.2" >/dev/null 2>&1; then
if test x"$xdt_feature_deps_missing" = x""; then
- xdt_feature_deps_missing="sm >= 1.2.3"
+ xdt_feature_deps_missing="sm >= 1.2.2"
else
- xdt_feature_deps_missing="$xdt_feature_deps_missing, sm >= 1.2.3"
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, sm >= 1.2.2"
fi
fi
else
@@ -22374,9 +22374,9 @@ fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sm >= 1.2.3" >&5
-printf %s "checking for sm >= 1.2.3... " >&6; }
- if $PKG_CONFIG "--atleast-version=1.2.3" "sm" >/dev/null 2>&1; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sm >= 1.2.2" >&5
+printf %s "checking for sm >= 1.2.2... " >&6; }
+ if $PKG_CONFIG "--atleast-version=1.2.2" "sm" >/dev/null 2>&1; then
LIBSM_VERSION=`$PKG_CONFIG --modversion "sm"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_VERSION" >&5
printf "%s\n" "$LIBSM_VERSION" >&6; }
@@ -22393,7 +22393,7 @@ printf %s "checking LIBSM_LIBS... " >&6;
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_LIBS" >&5
printf "%s\n" "$LIBSM_LIBS" >&6; }
- LIBSM_REQUIRED_VERSION=1.2.3
+ LIBSM_REQUIRED_VERSION=1.2.2
@@ -22422,7 +22422,7 @@ printf "%s\n" "found, but $xdt_cv_versio
echo "*** The required package sm was found on your system,"
echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade sm to atleast version 1.2.3, or adjust"
+ echo "*** Please upgrade sm to atleast version 1.2.2, or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
echo "*** the new version of the package in a nonstandard prefix so"
echo "*** pkg-config is able to find it."
@@ -22434,7 +22434,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package sm was not found on your system."
- echo "*** Please install sm (atleast version 1.2.3) or adjust"
+ echo "*** Please install sm (atleast version 1.2.2) or adjust"
echo "*** the PKG_CONFIG_PATH environment variable if you"
echo "*** installed the package in a nonstandard prefix so that"
echo "*** pkg-config is able to find it."

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a9c5074c7338b881a5259d3b643619bf84901360c03478e1a697938ece06516
size 922274

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0b80b7136515bc3c0c54fa859ad420365e29b715b6da0b58a2d2781bfbe73c3
size 1226931

View File

@@ -12,39 +12,3 @@ diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in
export XDG_DATA_DIRS export XDG_DATA_DIRS
if test "x$XDG_CONFIG_DIRS" = "x" if test "x$XDG_CONFIG_DIRS" = "x"
diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
--- a/scripts/xinitrc.in.in 2019-05-13 13:08:40.936637683 +0800
+++ b/scripts/xinitrc.in.in 2019-05-13 13:20:51.177252943 +0800
@@ -44,12 +44,6 @@
fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-# set up XDG user directores. see
-# http://freedesktop.org/wiki/Software/xdg-user-dirs
-if command -v xdg-user-dirs-update >/dev/null 2>&1; then
- xdg-user-dirs-update
-fi
-
# For now, start with an empty list
XRESOURCES=""
@@ -81,14 +75,11 @@
# check if we start xfce4-session with ck-launch-session. this is only
# required for starting from a console, not a login manager
if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
- if command -v ck-launch-session >/dev/null 2>&1; then
- exec ck-launch-session xfce4-session
- else
- echo
- echo "You have tried to start Xfce with consolekit support, but"
- echo "ck-launch-session is not installed."
- echo "Aborted startup..."
- echo
+ if ! ck-launch-session xfce4-session; then
+ cat >&2 <<'EOF'
+Failed to start Xfce with consolekit support.
+Aborted startup...
+EOF
exit 1
fi
else

View File

@@ -1,7 +1,7 @@
diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in
--- a/scripts/startxfce4.in 2016-05-03 05:02:14.000000000 +0800 --- a/scripts/startxfce4.in 2024-03-31 17:51:38.000000000 +0800
+++ b/scripts/startxfce4.in 2019-05-20 18:52:01.014092674 +0800 +++ b/scripts/startxfce4.in 2024-04-02 15:01:59.917577714 +0800
@@ -76,6 +76,10 @@ @@ -96,6 +96,10 @@
then then
XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@" XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
fi fi
@@ -12,39 +12,3 @@ diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in
export XDG_DATA_DIRS export XDG_DATA_DIRS
if test "x$XDG_CONFIG_DIRS" = "x" if test "x$XDG_CONFIG_DIRS" = "x"
diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
--- a/scripts/xinitrc.in.in 2019-05-11 04:05:58.000000000 +0800
+++ b/scripts/xinitrc.in.in 2019-05-20 18:55:49.566603360 +0800
@@ -44,12 +44,6 @@
fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-# set up XDG user directores. see
-# http://freedesktop.org/wiki/Software/xdg-user-dirs
-if command -v xdg-user-dirs-update >/dev/null 2>&1; then
- xdg-user-dirs-update
-fi
-
# For now, start with an empty list
XRESOURCES=""
@@ -81,14 +75,11 @@
# check if we start xfce4-session with ck-launch-session. this is only
# required for starting from a console, not a login manager
if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
- if command -v ck-launch-session >/dev/null 2>&1; then
- exec ck-launch-session xfce4-session
- else
- echo
- echo "You have tried to start Xfce with consolekit support, but"
- echo "ck-launch-session is not installed."
- echo "Aborted startup..."
- echo
+ if ! ck-launch-session xfce4-session; then
+ cat >&2 <<'EOF'
+Failed to start Xfce with consolekit support.
+Aborted startup...
+EOF
exit 1
fi
else

View File

@@ -0,0 +1,32 @@
From: Takashi Iwai <tiwai@suse.de>
Subject: Drop '-D pulse' option from amixer invocations
References: bsc#1247640
The option breaks when the system is running with pipewire without
alsa-plugin-pulse stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
labwc/labwc-rc.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/labwc/labwc-rc.xml
+++ b/labwc/labwc-rc.xml
@@ -33,13 +33,13 @@
Suggested Xfce key bindings.
-->
<keybind key="XF86_AudioLowerVolume">
- <action name="Execute" command="amixer -D pulse sset Master 5%-" />
+ <action name="Execute" command="amixer sset Master 5%-" />
</keybind>
<keybind key="XF86_AudioRaiseVolume">
- <action name="Execute" command="amixer -D pulse sset Master 5%+" />
+ <action name="Execute" command="amixer sset Master 5%+" />
</keybind>
<keybind key="XF86_AudioMute">
- <action name="Execute" command="amixer -D pulse sset Master toggle" />
+ <action name="Execute" command="amixer sset Master toggle" />
</keybind>
<keybind key="W-q">
<action name="Close" />

View File

@@ -1,19 +1,125 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 9 18:20:02 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net> Tue Aug 5 13:41:07 UTC 2025 - Takashi Iwai <tiwai@suse.com>
- Update to version 4.18.4 - Fix the audio mixer invocation on Wayland (bsc#1247640):
* Update copyright year xfce4-session-drop-amixer-D-pulse-option.patch
* Explicitly depend on gio-unix-2.0
* Replace deprecated xfce_spawn_command_line_on_screen() -------------------------------------------------------------------
* Add missing G_(BEGIN|END)_DECLS Sun Mar 30 15:29:35 UTC 2025 - Manfred Hollstein <manfred.h@gmx.net>
* Add xapp for Wallpaper and Screenshot in xfce-portals.conf
* Add minimal xdg-desktop-portal conf file for Xfce (Fixes #181) - Build sub-package wayland-experimental only on Tumbleweed or
* Ensure all various XDG_* etc. env vars are passed to DBus and systemd Slowroll; Leap does not provide labwc (yet).
* Add missing export for XDG_CONFIG_HOME and XDG_CACHE_HOME
* Clean up SVG icon metadata for 24px, 48px actions -------------------------------------------------------------------
* Add action icons at 96px Mon Mar 24 08:26:59 UTC 2025 - Manfred Hollstein <manfred.h@gmx.net>
* Add icons at missing sizes, clean up SVG metadata
- Update to version 4.20.2:
* build: Fix include order on *BSD
* autotools-build: Be sure gdbus-codegen files are regenerated
- Remove obsolete 0003-fix-glib2_84-related-conditionals.patch
-------------------------------------------------------------------
Sun Mar 23 10:38:34 UTC 2025 - Manfred Hollstein <manfred.h@gmx.net>
- Update to version 4.20.1:
* wayland: Use labwc's --session option if available
* wayland: Don't pass xfce4-session to the optional compositor
cmdline
* build: Add missing dep flags
* build: Automate copyright year management
* build: Replace xdt-csource with glib-compile-resources
* build: Define xfce4 min version >= 4.18
* scripts: Make xflock4 blocking again
* startxfce4: Fix keyboard layout on wayland
* scripts: Remove unused .in level in xinitrc
* build: Add missing checks for headers
* build: Fix wrong include guard
* build: Add missing check for sigprocmask
* autotools-build: Check for xfce4-dev-tools in configure.ac
* build: Add missing dep flags
* build: Get rid of maintainer mode where gdbus-codegen is used
* Improve Wayland support
* Translation Updates * Translation Updates
- Refresh xfce4-session-adapt-session-scripts-git.patch and
xfce4-session-adapt-session-scripts.patch
- Refresh 0002-relax-x11-version.patch
* Add small hack to maintain the configure* files' modification
time; otherwise the whole aclocal, autoconf, automake series
will have to be run, which will fail.
- Add 0003-fix-glib2_84-related-conditionals.patch to fix errors
when building with glib2 < 2.84
-------------------------------------------------------------------
Fri Dec 20 10:28:13 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Add xwayland as a required package for the new subpackage
xfce4-session-wayland-experimental
-------------------------------------------------------------------
Sun Dec 15 14:19:18 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Update to version 4.20.0:
* Translation Updates
- Refresh 0002-relax-x11-version.patch
-------------------------------------------------------------------
Sun Dec 1 16:30:05 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Update to version 4.19.4 [development release]
* I18n: Update po/LINGUAS list
* Fix leak of reason messages from libSM
* wayland: Wait for VT switch for LightDM users before starting
compositor
* Avoid using bzero
* users wanting to shutdown should be in the _shutdown group since
OpenBSD 7.4
* Translation Updates
- Refresh 0002-relax-x11-version.patch
-------------------------------------------------------------------
Sun Dec 1 15:43:15 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Move all files for a wayland session into a new additional
subpackage "xfce4-session-wayland-experimental".
-------------------------------------------------------------------
Sat Nov 2 16:56:59 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Update to version 4.19.3 [development release]
* manager: Fix SmsClientHostName leak
* Fix leaks in xfsm_properties_load
* manager: Fix leaks in xfsm_manager_load_failsafe
* Added missing Keywords entry to .desktop files
* manager: Fix string array leak
* Fix string leak in main()
* Fix leaks in settings_list_sessions_open_key_file
* manager: Fix string leaks
* build: Bump requirements for Xfce 4.20
* logout-dialog: Fix use-after-free when getting logout action
* Apply .clang-format file
* Fix gtk-layer-shell includes
* Add xapp for Background xfce-portals.conf
* manager: Fix wrong release function
* Add css class for session chooser
* scan-build: Fix unix.Malloc
* scan-build: Add false positive file
* build: clang: Fix -Wcast-align
* build: Fix -Werror=unused-variable
* Revert "Add new CI builds to build without X11 and Wayland"
* build: Fix check for _IceTransNoListen
* Translation Updates
- Refresh 0002-relax-x11-version.patch
-------------------------------------------------------------------
Thu Oct 24 09:30:45 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
- Add 0002-relax-x11-version.patch to allow build for Leap with its
ancient but sufficient X11 packages.
-------------------------------------------------------------------
Tue Apr 2 06:29:12 UTC 2024 - Maurizio Galli <maurizio.galli@suse.com>
- Updated to version 4.19.2 (development branch)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 26 07:11:11 UTC 2023 - Maurizio Galli <maurizio.galli@suse.com> Thu Oct 26 07:11:11 UTC 2023 - Maurizio Galli <maurizio.galli@suse.com>
@@ -349,8 +455,8 @@ Mon Aug 12 08:03:46 UTC 2019 - Maurizio Galli <maurizio.galli@gmail.com>
- Fixed up spec file - Fixed up spec file
- Don't install xscreensaver.desktop. We use xfce4-screensaver instead - Don't install xscreensaver.desktop. We use xfce4-screensaver instead
-------------------------------------------------------------------
-------------------------------------------------------------------
Wed Jun 5 23:59:55 UTC 2019 - maurizio.galli@gmail.com Wed Jun 5 23:59:55 UTC 2019 - maurizio.galli@gmail.com
- Removed add-light-locker-support.patch. Replaced by - Removed add-light-locker-support.patch. Replaced by

View File

@@ -1,7 +1,7 @@
# #
# spec file for package xfce4-session # spec file for package xfce4-session
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,13 @@
%bcond_with git %bcond_with git
Name: xfce4-session Name: xfce4-session
Version: 4.18.4 Version: 4.20.2
Release: 0 Release: 0
Summary: Xfce Session Manager Summary: Xfce Session Manager
License: GPL-2.0-only License: GPL-2.0-only
Group: System/GUI/XFCE Group: System/GUI/XFCE
URL: https://docs.xfce.org/xfce/xfce4-session/start URL: https://docs.xfce.org/xfce/xfce4-session/start
Source0: https://archive.xfce.org/src/xfce/xfce4-session/4.18/%{name}-%{version}.tar.bz2 Source0: https://archive.xfce.org/src/xfce/xfce4-session/4.20/%{name}-%{version}.tar.bz2
Source1: xfce-portals.conf Source1: xfce-portals.conf
Source2: xdg-current-desktop-xfce.desktop Source2: xdg-current-desktop-xfce.desktop
%if %{with git} %if %{with git}
@@ -34,29 +34,37 @@ Patch0: xfce4-session-adapt-session-scripts-git.patch
# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE. # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE.
Patch1: xfce4-session-adapt-session-scripts.patch Patch1: xfce4-session-adapt-session-scripts.patch
%endif %endif
# PATCH-FIX-OPENSUSE 0002-relax-x11-version.patch -- Allow build for Leap with its ancient but sufficient X11 packages.
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
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gettext >= 0.19.8
BuildRequires: iceauth BuildRequires: iceauth
BuildRequires: intltool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xfce4-dev-tools BuildRequires: xfce4-dev-tools
BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gio-2.0) >= 2.66.0 BuildRequires: pkgconfig(gdk-wayland-3.0) >= 3.24.0
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.66.0 BuildRequires: pkgconfig(gdk-x11-3.0) >= 3.24.0
BuildRequires: pkgconfig(glib-2.0) >= 2.66.0 BuildRequires: pkgconfig(gio-2.0) >= 2.72.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.66.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.72.0
BuildRequires: pkgconfig(glib-2.0) >= 2.72.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.72.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0
BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(gtk-layer-shell-0) >= 0.7.0
BuildRequires: pkgconfig(ice) >= 1.0.9
BuildRequires: pkgconfig(libwnck-3.0) >= 3.10 BuildRequires: pkgconfig(libwnck-3.0) >= 3.10
BuildRequires: pkgconfig(libxfce4panel-2.0) BuildRequires: pkgconfig(libxfce4panel-2.0)
BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.2 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.4
BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.17.2 BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.19.2
BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0 BuildRequires: pkgconfig(libxfce4windowing-0) >= 4.19.2
BuildRequires: pkgconfig(libxfconf-0) >= 4.18.0
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm) >= 1.2.2
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11) >= 1.6.7
Requires: %{name}-branding Requires: %{name}-branding
Requires: systemd Requires: systemd
Requires: xfce4-settings Requires: xfce4-settings
@@ -95,10 +103,29 @@ BuildArch: noarch
%description branding-upstream %description branding-upstream
This package provides the upstream look and feel for the Xfce Session Manager. This package provides the upstream look and feel for the Xfce Session Manager.
%if 0%{is_opensuse} && 0%{suse_version} >= 1550
%package wayland-experimental
Summary: Xfce Session Manager for Wayland
Group: System/GUI/XFCE
Requires: %{name} = %{version}
Requires: labwc
Requires: xwayland
%description wayland-experimental
xfce4-wayland-experimental-session is the Wayland session manager
for the Xfce desktop environment.
%endif
%lang_package %lang_package
%prep %prep
%autosetup -p1 # Hack to avoid having to run autotools:
%setup -q
cp -p ./configure ./configure.orig
cp -p ./configure.ac ./configure.ac.orig
%autopatch -p1
touch -r ./configure.ac.orig ./configure.ac
touch -r ./configure.orig ./configure
%build %build
%if %{with git} %if %{with git}
@@ -143,8 +170,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
# remove xscreensaver desktop file. We use xfce4-screensaver instead. # Remove all wayland/labwc related stuff on Leap; sub-package wayland-experimental
rm %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop # won't be generated at all
%if 0%{suse_version} < 1550
rm -f %{buildroot}%{_datadir}/xfce4/labwc/labwc*
rmdir %{buildroot}%{_datadir}/xfce4/labwc
rm -f %{buildroot}%{_datadir}/wayland-sessions/xfce-wayland.desktop
rmdir %{buildroot}%{_datadir}/wayland-sessions
%endif
%post %post
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
@@ -156,7 +189,7 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
%files %files
%license COPYING %license COPYING
%doc AUTHORS BUGS NEWS README.md TODO %doc AUTHORS NEWS README.md
%config %{_sysconfdir}/xdg/xfce4/Xft.xrdb %config %{_sysconfdir}/xdg/xfce4/Xft.xrdb
%{_sysconfdir}/xdg/xfce4/xinitrc %{_sysconfdir}/xdg/xfce4/xinitrc
%config %{_sysconfdir}/xdg/autostart/xdg-current-desktop-xfce.desktop %config %{_sysconfdir}/xdg/autostart/xdg-current-desktop-xfce.desktop
@@ -180,4 +213,12 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
%files branding-upstream %files branding-upstream
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
%if 0%{is_opensuse} && 0%{suse_version} >= 1550
%files wayland-experimental
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/xfce-wayland.desktop
%dir %{_datadir}/xfce4/labwc
%{_datadir}/xfce4/labwc/labwc*
%endif
%changelog %changelog