Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xfce4-session for openSUSE:Factory
checked in at 2025-03-27 22:32:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old)
and /work/SRC/openSUSE:Factory/.xfce4-session.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session"
Thu Mar 27 22:32:08 2025 rev:93 rq:1256328 version:4.20.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes
2024-12-31 11:12:52.823008719 +0100
+++ /work/SRC/openSUSE:Factory/.xfce4-session.new.2696/xfce4-session.changes
2025-03-27 22:32:19.268655487 +0100
@@ -1,0 +2,39 @@
+Mon Mar 24 08:26:59 UTC 2025 - Manfred Hollstein <manfre...@gmx.net>
+
+- 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 <manfre...@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
+- 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
+
+-------------------------------------------------------------------
Old:
----
xfce4-session-4.20.0.tar.bz2
New:
----
xfce4-session-4.20.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-session.spec ++++++
--- /var/tmp/diff_new_pack.6xdq77/_old 2025-03-27 22:32:19.800677509 +0100
+++ /var/tmp/diff_new_pack.6xdq77/_new 2025-03-27 22:32:19.800677509 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-session
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%bcond_with git
Name: xfce4-session
-Version: 4.20.0
+Version: 4.20.2
Release: 0
Summary: Xfce Session Manager
License: GPL-2.0-only
@@ -59,10 +59,10 @@
BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.4
BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.19.2
BuildRequires: pkgconfig(libxfce4windowing-0) >= 4.19.2
-BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0
+BuildRequires: pkgconfig(libxfconf-0) >= 4.18.0
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102
BuildRequires: pkgconfig(sm) >= 1.2.2
-BuildRequires: pkgconfig(x11) >= 1.6.5
+BuildRequires: pkgconfig(x11) >= 1.6.7
Requires: %{name}-branding
Requires: systemd
Requires: xfce4-settings
@@ -115,7 +115,13 @@
%lang_package
%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
%if %{with git}
@@ -197,4 +203,6 @@
%files wayland-experimental
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/xfce-wayland.desktop
+%dir %{_datadir}/xfce4/labwc
+%{_datadir}/xfce4/labwc/labwc*
++++++ 0002-relax-x11-version.patch ++++++
--- /var/tmp/diff_new_pack.6xdq77/_old 2025-03-27 22:32:19.828678668 +0100
+++ /var/tmp/diff_new_pack.6xdq77/_new 2025-03-27 22:32:19.832678834 +0100
@@ -1,12 +1,9 @@
diff -rup a/configure.ac b/configure.ac
---- a/configure.ac 2024-12-15 10:25:08.000000000 +0100
-+++ b/configure.ac 2024-12-15 15:21:11.133488999 +0100
-@@ -16,10 +16,10 @@ m4_define([libxfce4ui_min_version], [4.1
- m4_define([xfconf_min_version], [4.12.0])
- m4_define([libxfce4windowing_min_version], [4.19.2])
+--- 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([libx11_min_version], [1.6.5])
+ 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])
@@ -16,64 +13,9 @@
m4_define([gtk_layer_shell_min_version], [0.7.0])
diff -rup a/configure b/configure
---- a/configure 2024-12-15 10:26:08.000000000 +0100
-+++ b/configure 2024-12-15 15:22:51.370125178 +0100
-@@ -19095,11 +19095,11 @@ printf "%s\n" "not found" >&6; }
-
-
- if test x"$xdt_feature_deps_check_only" = x"yes"; then
-- if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then
-+ if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then
- if test x"$xdt_feature_deps_missing" = x""; then
-- xdt_feature_deps_missing="x11 >= 1.6.7"
-+ xdt_feature_deps_missing="x11 >= 1.6.5"
- else
-- xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7"
-+ xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5"
- fi
- fi
- else
-@@ -19253,9 +19253,9 @@ fi
-
-
-
-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5
--printf %s "checking for x11 >= 1.6.7... " >&6; }
-- if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then
-+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5
-+printf %s "checking for x11 >= 1.6.5... " >&6; }
-+ if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then
- LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5
- printf "%s\n" "$LIBX11_VERSION" >&6; }
-@@ -19272,7 +19272,7 @@ printf %s "checking LIBX11_LIBS... " >&6
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5
- printf "%s\n" "$LIBX11_LIBS" >&6; }
-
-- LIBX11_REQUIRED_VERSION=1.6.7
-+ LIBX11_REQUIRED_VERSION=1.6.5
-
-
-
-@@ -19301,7 +19301,7 @@ printf "%s\n" "found, but $xdt_cv_versio
-
- echo "*** The required package x11 was found on your system,"
- echo "*** but the installed version ($xdt_cv_version) is too old."
-- echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust"
-+ echo "*** Please upgrade x11 to atleast version 1.6.5, 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."
-@@ -19313,7 +19313,7 @@ printf "%s\n" "not found" >&6; }
-
-
- echo "*** The required package x11 was not found on your system."
-- echo "*** Please install x11 (atleast version 1.6.7) or adjust"
-+ echo "*** Please install x11 (atleast version 1.6.5) 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."
-@@ -19559,11 +19559,11 @@ printf "%s\n" "not found" >&6; }
+--- 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
@@ -88,7 +30,7 @@
fi
fi
else
-@@ -19717,9 +19717,9 @@ fi
+@@ -20948,9 +20948,9 @@ fi
@@ -101,7 +43,7 @@
LIBICE_VERSION=`$PKG_CONFIG --modversion "ice"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_VERSION" >&5
printf "%s\n" "$LIBICE_VERSION" >&6; }
-@@ -19736,7 +19736,7 @@ printf %s "checking LIBICE_LIBS... " >&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; }
@@ -110,7 +52,7 @@
-@@ -19765,7 +19765,7 @@ printf "%s\n" "found, but $xdt_cv_versio
+@@ -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."
@@ -119,7 +61,7 @@
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."
-@@ -19777,7 +19777,7 @@ printf "%s\n" "not found" >&6; }
+@@ -21008,7 +21008,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package ice was not found on your system."
@@ -128,7 +70,7 @@
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."
-@@ -19791,11 +19791,11 @@ printf "%s\n" "not found" >&6; }
+@@ -21022,11 +21022,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
@@ -143,7 +85,7 @@
fi
fi
else
-@@ -19949,9 +19949,9 @@ fi
+@@ -21185,9 +21185,9 @@ fi
@@ -156,7 +98,7 @@
LIBSM_VERSION=`$PKG_CONFIG --modversion "sm"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_VERSION" >&5
printf "%s\n" "$LIBSM_VERSION" >&6; }
-@@ -19968,7 +19968,7 @@ printf %s "checking LIBSM_LIBS... " >&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; }
@@ -165,7 +107,7 @@
-@@ -19997,7 +19997,7 @@ printf "%s\n" "found, but $xdt_cv_versio
+@@ -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."
@@ -174,7 +116,7 @@
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."
-@@ -20009,7 +20009,7 @@ printf "%s\n" "not found" >&6; }
+@@ -21245,7 +21245,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package sm was not found on your system."
@@ -183,62 +125,7 @@
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."
-@@ -20259,11 +20259,11 @@ printf "%s\n" "not found" >&6; }
-
-
- if test x"$xdt_feature_deps_check_only" = x"yes"; then
-- if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then
-+ if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then
- if test x"$xdt_feature_deps_missing" = x""; then
-- xdt_feature_deps_missing="x11 >= 1.6.7"
-+ xdt_feature_deps_missing="x11 >= 1.6.5"
- else
-- xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7"
-+ xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5"
- fi
- fi
- else
-@@ -20417,9 +20417,9 @@ fi
-
-
-
-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5
--printf %s "checking for x11 >= 1.6.7... " >&6; }
-- if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then
-+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5
-+printf %s "checking for x11 >= 1.6.5... " >&6; }
-+ if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then
- LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5
- printf "%s\n" "$LIBX11_VERSION" >&6; }
-@@ -20436,7 +20436,7 @@ printf %s "checking LIBX11_LIBS... " >&6
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5
- printf "%s\n" "$LIBX11_LIBS" >&6; }
-
-- LIBX11_REQUIRED_VERSION=1.6.7
-+ LIBX11_REQUIRED_VERSION=1.6.5
-
-
-
-@@ -20465,7 +20465,7 @@ printf "%s\n" "found, but $xdt_cv_versio
-
- echo "*** The required package x11 was found on your system,"
- echo "*** but the installed version ($xdt_cv_version) is too old."
-- echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust"
-+ echo "*** Please upgrade x11 to atleast version 1.6.5, 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."
-@@ -20477,7 +20477,7 @@ printf "%s\n" "not found" >&6; }
-
-
- echo "*** The required package x11 was not found on your system."
-- echo "*** Please install x11 (atleast version 1.6.7) or adjust"
-+ echo "*** Please install x11 (atleast version 1.6.5) 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."
-@@ -20723,11 +20723,11 @@ printf "%s\n" "not found" >&6; }
+@@ -21974,11 +21974,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
@@ -253,7 +140,7 @@
fi
fi
else
-@@ -20881,9 +20881,9 @@ fi
+@@ -22137,9 +22137,9 @@ fi
@@ -266,7 +153,7 @@
LIBICE_VERSION=`$PKG_CONFIG --modversion "ice"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICE_VERSION" >&5
printf "%s\n" "$LIBICE_VERSION" >&6; }
-@@ -20900,7 +20900,7 @@ printf %s "checking LIBICE_LIBS... " >&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; }
@@ -275,7 +162,7 @@
-@@ -20929,7 +20929,7 @@ printf "%s\n" "found, but $xdt_cv_versio
+@@ -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."
@@ -284,7 +171,7 @@
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."
-@@ -20941,7 +20941,7 @@ printf "%s\n" "not found" >&6; }
+@@ -22197,7 +22197,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package ice was not found on your system."
@@ -293,7 +180,7 @@
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."
-@@ -20955,11 +20955,11 @@ printf "%s\n" "not found" >&6; }
+@@ -22211,11 +22211,11 @@ printf "%s\n" "not found" >&6; }
if test x"$xdt_feature_deps_check_only" = x"yes"; then
@@ -308,7 +195,7 @@
fi
fi
else
-@@ -21113,9 +21113,9 @@ fi
+@@ -22374,9 +22374,9 @@ fi
@@ -321,7 +208,7 @@
LIBSM_VERSION=`$PKG_CONFIG --modversion "sm"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBSM_VERSION" >&5
printf "%s\n" "$LIBSM_VERSION" >&6; }
-@@ -21132,7 +21132,7 @@ printf %s "checking LIBSM_LIBS... " >&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; }
@@ -330,7 +217,7 @@
-@@ -21161,7 +21161,7 @@ printf "%s\n" "found, but $xdt_cv_versio
+@@ -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."
@@ -339,7 +226,7 @@
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."
-@@ -21173,7 +21173,7 @@ printf "%s\n" "not found" >&6; }
+@@ -22434,7 +22434,7 @@ printf "%s\n" "not found" >&6; }
echo "*** The required package sm was not found on your system."
++++++ xfce4-session-4.20.0.tar.bz2 -> xfce4-session-4.20.2.tar.bz2 ++++++
++++ 26756 lines of diff (skipped)
++++++ xfce4-session-adapt-session-scripts-git.patch ++++++
--- /var/tmp/diff_new_pack.6xdq77/_old 2025-03-27 22:32:20.448704333 +0100
+++ /var/tmp/diff_new_pack.6xdq77/_new 2025-03-27 22:32:20.452704499 +0100
@@ -12,40 +12,4 @@
export XDG_DATA_DIRS
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
++++++ xfce4-session-adapt-session-scripts.patch ++++++
--- /var/tmp/diff_new_pack.6xdq77/_old 2025-03-27 22:32:20.468705161 +0100
+++ /var/tmp/diff_new_pack.6xdq77/_new 2025-03-27 22:32:20.472705326 +0100
@@ -12,40 +12,4 @@
export XDG_DATA_DIRS
if test "x$XDG_CONFIG_DIRS" = "x"
-diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
---- a/scripts/xinitrc.in.in 2024-03-31 17:51:38.000000000 +0800
-+++ b/scripts/xinitrc.in.in 2024-04-02 15:04:34.326572166 +0800
-@@ -46,12 +46,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
--
- if test "x$XFCE4_SESSION_COMPOSITOR" = "x"
- then
- # For now, start with an empty list
-@@ -115,14 +109,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
