From f49e320df5d446a6d82447458b360599b822adcac9efe889e06a7489541cd40b Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Tue, 17 Dec 2024 07:25:36 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=167 --- .gitattributes | 23 + .gitignore | 1 + 0002-relax-x11-version.patch | 350 ++++++ xdg-current-desktop-xfce.desktop | 13 + xfce-portals.conf | 2 + xfce4-session-4.18.4.tar.bz2 | 3 + xfce4-session-4.20.0.tar.bz2 | 3 + xfce4-session-adapt-session-scripts-git.patch | 50 + xfce4-session-adapt-session-scripts.patch | 50 + xfce4-session.changes | 1100 +++++++++++++++++ xfce4-session.spec | 200 +++ 11 files changed, 1795 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 0002-relax-x11-version.patch create mode 100644 xdg-current-desktop-xfce.desktop create mode 100644 xfce-portals.conf create mode 100644 xfce4-session-4.18.4.tar.bz2 create mode 100644 xfce4-session-4.20.0.tar.bz2 create mode 100644 xfce4-session-adapt-session-scripts-git.patch create mode 100644 xfce4-session-adapt-session-scripts.patch create mode 100644 xfce4-session.changes create mode 100644 xfce4-session.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0002-relax-x11-version.patch b/0002-relax-x11-version.patch new file mode 100644 index 0000000..1591c13 --- /dev/null +++ b/0002-relax-x11-version.patch @@ -0,0 +1,350 @@ +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]) + +-m4_define([libx11_min_version], [1.6.7]) ++m4_define([libx11_min_version], [1.6.5]) + 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 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; } + + + 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 +@@ -19717,9 +19717,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; } +@@ -19736,7 +19736,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 + + + +@@ -19765,7 +19765,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." +@@ -19777,7 +19777,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." +@@ -19791,11 +19791,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 +@@ -19949,9 +19949,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; } +@@ -19968,7 +19968,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 + + + +@@ -19997,7 +19997,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." +@@ -20009,7 +20009,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." +@@ -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; } + + + 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 +@@ -20881,9 +20881,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; } +@@ -20900,7 +20900,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 + + + +@@ -20929,7 +20929,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." +@@ -20941,7 +20941,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." +@@ -20955,11 +20955,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 +@@ -21113,9 +21113,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; } +@@ -21132,7 +21132,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 + + + +@@ -21161,7 +21161,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." +@@ -21173,7 +21173,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." diff --git a/xdg-current-desktop-xfce.desktop b/xdg-current-desktop-xfce.desktop new file mode 100644 index 0000000..9c36a16 --- /dev/null +++ b/xdg-current-desktop-xfce.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=0.9.4 +Type=Application +Name=xdg-current-desktop-xfce +Comment= +Exec=sh -c "dbus-update-activation-environment --systemd XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP && systemctl --user restart xdg-desktop-portal" +OnlyShowIn=XFCE; +RunHook=0 +StartupNotify=false +Terminal=false +Hidden=false + diff --git a/xfce-portals.conf b/xfce-portals.conf new file mode 100644 index 0000000..85efaa5 --- /dev/null +++ b/xfce-portals.conf @@ -0,0 +1,2 @@ +[preferred] +default=gtk; \ No newline at end of file diff --git a/xfce4-session-4.18.4.tar.bz2 b/xfce4-session-4.18.4.tar.bz2 new file mode 100644 index 0000000..df33bb4 --- /dev/null +++ b/xfce4-session-4.18.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a9c5074c7338b881a5259d3b643619bf84901360c03478e1a697938ece06516 +size 922274 diff --git a/xfce4-session-4.20.0.tar.bz2 b/xfce4-session-4.20.0.tar.bz2 new file mode 100644 index 0000000..9feaa93 --- /dev/null +++ b/xfce4-session-4.20.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5229233fe6ee692361cc28724886c5b08e0216d89f09c42d273191d38fd64f85 +size 1185603 diff --git a/xfce4-session-adapt-session-scripts-git.patch b/xfce4-session-adapt-session-scripts-git.patch new file mode 100644 index 0000000..a87f8db --- /dev/null +++ b/xfce4-session-adapt-session-scripts-git.patch @@ -0,0 +1,50 @@ +diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in +--- a/scripts/startxfce4.in 2019-05-13 13:08:40.936637683 +0800 ++++ b/scripts/startxfce4.in 2019-05-13 13:16:44.378397419 +0800 +@@ -76,6 +76,10 @@ + then + XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@" + fi ++if test -d "@_datadir_@/xfce" ++then ++ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" ++fi + 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 diff --git a/xfce4-session-adapt-session-scripts.patch b/xfce4-session-adapt-session-scripts.patch new file mode 100644 index 0000000..6bf5ca5 --- /dev/null +++ b/xfce4-session-adapt-session-scripts.patch @@ -0,0 +1,50 @@ +diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in +--- a/scripts/startxfce4.in 2024-03-31 17:51:38.000000000 +0800 ++++ b/scripts/startxfce4.in 2024-04-02 15:01:59.917577714 +0800 +@@ -96,6 +96,10 @@ + then + XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@" + fi ++if test -d "@_datadir_@/xfce" ++then ++ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" ++fi + 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 diff --git a/xfce4-session.changes b/xfce4-session.changes new file mode 100644 index 0000000..56981c3 --- /dev/null +++ b/xfce4-session.changes @@ -0,0 +1,1100 @@ +------------------------------------------------------------------- +Sun Dec 15 14:19:18 UTC 2024 - Manfred Hollstein + +- Update to version 4.20.0: + * Translation Updates +- Refresh 0002-relax-x11-version.patch + +------------------------------------------------------------------- +Sun Dec 1 16:30:05 UTC 2024 - Manfred Hollstein + +- 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 + +- 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 + +- 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 + +- 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 + +- Updated to version 4.19.2 (development branch) + +------------------------------------------------------------------- +Thu Oct 26 07:11:11 UTC 2023 - Maurizio Galli + +- Added xfce-portals.conf file. XDP 0.18.0 requires desktop and other + environments to have their own portals.conf drop in file and this + is a workaround until a better fix lands (boo#1215641) + +- Added xdg-current-desktop-xfce.desktop to autostart to ensure variable + XDG_CURRENT_DESKTOP variable is properly exposed to systemd (boo#1215641) + +- Relax requirement of branding package version to prevent + xfce4-branding-openSUSE breaking on Leap due to repos being out of sync + (boo#1216470) + +------------------------------------------------------------------- +Mon May 29 17:28:12 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.3 + * shutdown: Do not set an error when returning TRUE + * logout-dialog: Fix use-after-free + * Use glib wrappers for memory allocation + * build: Fix build when there is no suspend/hibernate support + * build: Add suspend support for Solaris + * startxfce4: Fix xinit arguments order + * manager: Always use xfsm_manager_save_yourself_dbus() (Fixes #106) + * settings: Remove useless tooltip + * xflock4: Update fallback list + * logout-dialog: Lower warning level + * shutdown: Keep error NULL when unused + * cleanup: Remove dead polkit code + * Revert "Fallback to old method for shutdown (bug #8630)." + * Use g_critical() instead of g_error() + * Use GLib logging functions or g_printerr() instead of g_print() + * Use GLib logging functions instead of g_printerr() + * build: Fix untranslated policykit file + * Escape/unescape string list delimiter when saving/restoring session + * Replace XfceRc with GKeyFile for session file parsing + * Translation Updates + +------------------------------------------------------------------- +Tue Mar 28 18:10:04 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.2 + * manager: Fix GQueue memory management + * Fix Xfconf memory management + * Update bug report address + * Fix suspend/hibernation bug on ConsoleKit2 (Fixes #164) + +------------------------------------------------------------------- +Fri Feb 10 12:27:40 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.1 + * Update copyright year + * Fix bus name acquisition/ownership (#54, !34) + * Use XfceScreensaver from Libxfce4ui (!35) + * build: Fix previous commit + * build: Fix autotools warnings + * Avoid duplicating directories in the tail of $XDG_* envs (#111, !21) + * settings: Fix memory leak + * libxfsm: Fix wrong return value + * Fix memory leaks when opening xfce4-session-settings + * Fix blurry session snapshots (!33) + * Fix blurry icons in autostart tab when UI scale > 1 (!33) + * build: Fix GTK deprecation warnings (!32) + * build: Fix some other GDK deprecation warnings (!32) + * build: Fix gdk_error_trap_push/pop() deprecation warnings (!32) + * build: Let xdt-depends.m4 macros set GLib macros (!32) + * build: Remove GDK_VERSION_MIN_REQUIRED/MAX_ALLOWED (!32) + * Make use of translations for run hooks (Fixes #156) + * Translation Updates +- Regenerate xfce4-session-adapt-session-scripts-git.patch and + xfce4-session-adapt-session-scripts.patch +- Remove two stray comments about add-light-locker-support patches + +------------------------------------------------------------------- +Thu Dec 22 13:18:02 UTC 2022 - Manfred Hollstein + +- Update to version 4.18.0 + * Bump requirements for Xfce 4.18 + * Translation Updates +- Remove add-light-locker-support-git.patch and add-light-locker-support.patch + +- Update to version 4.17.2 + * logout-dialog: New Xfconf property "ShowSave" (!29) + * bump copyright year to 2022 + +- Update to version 4.17.1 + * Translation Updates + +- Update to version 4.17.0 + * settings: Revert type hint change + * Check getgrgid(3) return value to avoid crash + * build: Fix intltool lock file problem during make distcheck + * Remove pre-defined lockers + * Refresh list of screensavers (#17) + * Do not mind output of screensaver, if successful + * Run custom command in a separate shell + * Avoid extra pause by redirecting stdin + * Update COPYING + * Increase switch user timeout (!25) + * xflock4: Apply initial delay before running a screensaver/locker (#29) + * xflock4: Update copyrights + * xflock4: make the script executable + * Add labels to inline toolbar buttons + * Use correct icon for Close button + * Translation Updates + +------------------------------------------------------------------- +Wed Dec 23 01:25:05 UTC 2020 - Maurizio Galli + +- Update to version 4.16.0 + - settings: Accept all types of GIcon + - settings: Adjust inline toolbar + - Fix compilation with -Wmissing-prototypes + - Don't warn when there are no saved sessions + - bump glib (and gio, gthread, etc) minimum to 2.50.0 + - Remove GSourceFunc casts + - Update .gitignore + - Add README.md to EXTRA_DIST + - Translation Updates + +------------------------------------------------------------------- +Sat Nov 7 21:07:01 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.1 + * Fix potential crash in suspend and shutdown + (gxo#xfce/xfce4-session#65) + * Avoid potential format-string vulns + (gxo#xfce/xfce4-session#65) + * settings: Tweak 'Current Session' tab + * settings: Make 'App Autostart' columns sortable + * settings: Fix 'Current session' column width + (gxo#xfce/xfce4-session!10) + * Add lock icon, 24px and 32px icons + * Add more guards around GErrors + * Update copyright year + * Fix ifdef + * Translation Updates + +------------------------------------------------------------------- +Fri Aug 28 22:38:31 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.15.0 + * Use new icon in settings dialog (bxo#16885) + * Add new application icon and rDNS icon name + * logout-dialog: Add new icons + * logout-dialog: Bump icon size to 48px + * Switch to symbolic window-close icons + * Drop GDM compatibility code to avoid invalid session locale + * Segfault when suspending without pm-suspend installed (bxo#16632) + * Expand field codes + * Add a GnuPG 2.1+ mode + * Fix session crash at logout (bxo#16105) + * Free the intermediate "cmd" variable in xfsm_startup_init() + * Re-add xfsm_startup_shutdown() call to xfce4-session main() + * Remove sys/sysctl.h on linux platform + * Move from exo-csource to xdt-csource (bxo#16717) + * Try xfce screensaver before cinnamon (bxo#16223) + * Add support for xfce4-screensaver (bxo#16522) + * Silence runtime warning (bxo#15731) + * settings: Don't warn when there are no saved sessions + (gxo#xfce/xfce4-session#62) + * settings: Add sort-on-click to columns in "Current Session" tab (!3) + * settings: Add keywords for discoverability (bxo#10694) + * settings: Add tooltips to image-buttons + * settings: Better app icon lookup + * settings: Be more precise in infobar wording + * settings: Drop inline-toolbar button labels + * settings: Move autostart info to docs.xfce + * settings: Don't make 'saved sessions' tab reorderable + * settings: Sort saved sessions by most recently used (bxo#15338) + * Only clean generated sources when in maintainer mode + * Do not show translation info on --help output + * Translation Updates + +------------------------------------------------------------------- +Sun Mar 29 00:18:36 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.14.2 + * Add support for xfce4-screensaver (bxo#16522) + * Try xfce screensaver before cinnamon (bxo#16223) + * Translation Updates + +------------------------------------------------------------------- +Sun Jan 12 13:44:36 UTC 2020 - Marcel Kuehlhorn + +- Update to version 4.14.1 + * Fix session crash at logout (bxo#16105) + * settings: Don't make 'saved sessions' tab reorderable + * Translation Updates + +------------------------------------------------------------------- +Fri Aug 16 12:00:27 UTC 2019 - Maurizio Galli + +- Fixed sources in spec file + +------------------------------------------------------------------- +Mon Aug 12 08:03:46 UTC 2019 - Maurizio Galli + +- Update to version 4.14.0 + * settings: Fix icon name + * settings: Replace GtkStock buttons + * Set XAUTHLOCALHOSTNAME in systemd user session (bxo#15440) + * Translation Updates +- Changes from version 4.13.4 + * Process Gtk events prior to starting D-Bus (bxo#15712) + * Splash engines are not present anymore in xfce4-session + (obsoletes the lib and -devel Subpackages) + * Translation updates +- Changes from version 4.13.3 + * Reset font-size of logout dialog to default (bxo#15505) + * Report optional dependency on polkit (bxo#12761) + * Read data from correct group when editing autostart entry + (bxo#10423) + * Improve layout of autostart add/edit dialogs + * Improve column layout of autostart tab (bxo#15448) + * settings: Fix crash when terminating programs (bxo#15489) + * Translation updates + - Update to version 4.13.2 + - Drop splash screens + - Introduce priority-group startup for FailSafe Session + - Optionally run commands on logout, suspend etc. (bxo#10172) + - xflock4: + - Do not override PATH with hardcoded value. + - Add support for xfce4-screensaver to xflock4 + - chooser: + - Improve look and feel of the session chooser + - Improve UI and add delete button (bxo#12799) + - Add fallback theming to chooser dialogs + - Enable keypress response to session creation + - Update session name in xfconf after chooser + - Fix case in session chooser buttons + - settings: + - Show saved sessions in settings dialog + - Move "lock screen before sleep" option to general tab + - Fix alignment of session lock property + - Fix PID showing in "Current Session" tab + - Improve icon matching in "Current Session" tab + - Add a label for the currently active session + - Add a "delete session" button to the session list + - Make the Autostart buttons an inline toolbar + - Initialize the session list treeview if necessary + - More settings dialog UI improvements + - Add column headers to autostart list + - In autostart some apps (e.g. xfce-polkit) have bigger icons + - Make entries expand in add/edit app startup dialog (bxo#15321) + - logout-dialog: + - Fix sensitivity of switch user button + - Remove blue border from logout dialog (bxo#15284) + - Improve default style of the logout dialog + - Add styleclass to make logout dialog themeable + - Set logout dialog icons from icon_name + - Support scaling in logout dialog (bxo#14951) + - Use a different icon for hybrid sleep when possible + - Fix mnemonic conflict on logout dialog + - Use systemd-logind methods instead of polkit permissions (bxo#14707) + - scripts/xinitrc.in.in: use "command" shell builtin instead of + which(1) + - Use sysconf(_SC_NGROUPS_MAX) instead of #defining an arbitrary + MAX_USER_GROUPS (bxo#14722) + - Don't auto start consolekit daemon if it is not running + - Added better shutdown fallback support for the BSDs (bxo#14722) + - Don't install generic icon names (bxo#11912) + - Use exec to launch xfce4-session from xinitrc + - xinitrc: Remove fallback path when xfce4-session is not installed + - Remove old unused autostart_migrate function + - Fix GVariant format string in dbus server + - Extend debug messages + - Silence compiler warnings + - Remove unused checks on configure step + - Drop unused function + - Remove useless ioprio.h check + - rollback fix of a warning (fix requires glib 2.58) + - Fixed warning "cast between incompatible function types" introduced + in GCC 8 + - replaced GList of windows with single window (not required any more) + - merged identic cases + - removed duplicated loop counter + - replaced deprecated "gtk_display_get_screen" - For each display + there is only one screen (See gtk3 doc of gdk_display_get_screen). + - bump gtk version to 3.22 and gmodule/gio to 2.42 + - Remove now useless XFCE_GLADE_*_PATH variables (bxo#13945) + - Tell intltool how to extract .ui files (bxo#14582) + - fix build failure when dbus is not in the system include path + (bxo#14386) + - Translation updates +- Changes from 4.13.1 + * Add/Edit Application Autostart Entries (bxo#13271) + * Remove non-existent grid properties (bxo#13271) + * fix coverity 178990 Resource leak + * fix coverity cid 178989 Dereference after null check + * 178988 'Constant' variable guards dead code + * fix coverity cid 178987 Logically dead code + * fix coverity cid 87608 Dereference after null check + * 178988 'Constant' variable guards dead code + * fix coverity cid 178987 Logically dead code + * fix coverity cid 87608 Dereference after null check + * fix coverity cid 87607 Unchecked return value from library + * Hybrid Sleep support - "hibernate" and suspend the system + * xfce4-session-logout: deconflict -h option (bxo#12806) + * Export the SSH_AUTH_SOCK when spawning client bxo#13486 + * fix: Compilation error with --disable-polkit bxo#12760 + * Require libxfce4ui-2 instead of libxfce4ui-1 in pc.in file + * xfsm-manager: pass manager variable to g_timeout_add bxo#13802 + * Bump GTK version to 3.20 + * Check accessibility depending on xfsm configuration + * Fix keyboard grab for logout window + * Fix fadeout window using Xlib API + * Fix gdk max version to 3.20 + * Translation updates +- Changes from 4.13.0 + * xfsm has been ported to Gtk3. + * xfsm now does session management for clients using the Gtk application + dbus interface. + * xfsm has been ported to GDBus. + * Add a switch user button to the logout dialog (bxo#10345) + * UPower dependency has been removed as the suspend/hibernate dbus calls + were dropped from it. + * Handle screensaver with it's own object (bxo#12603) + * Fix a crash when warning about the screenlocker (bxo#12603) + * When locking fallback to xflock4 first (bxo#12603) + * Add switch-user to the xfsm-logout program +- Added %bcond to improve portability of spec file between git master + and released sources +- Drop obsolete patch xfce4-session-simple-splash-remove-shadows.patch +- Drop obsolete patch xfce4-session-Make-verbose-logging-conditional.patch +- Dropped additional-lockers-support.patch +- Added add-light-locker-support.patch +- Added xfce4-session-adapt-session-scripts-git.patch for git master builds +- Added add-light-locker-support-git.patch for git master builds +- Dropped obsolete xfce4-session-systemd-user-addons.patch (fixed upstream) +- Fixed up spec file +- Don't install xscreensaver.desktop. We use xfce4-screensaver instead + +------------------------------------------------------------------- + +Wed Jun 5 23:59:55 UTC 2019 - maurizio.galli@gmail.com + +- Removed add-light-locker-support.patch. Replaced by + additional-lockers-support.patch which supports both + xfce4-screensaver and lightlocker + +------------------------------------------------------------------- +Sat Mar 30 21:20:52 UTC 2019 - olaf@aepfle.de + +- Remove a hunk from xinitrd. Upstream already sets + XDG_CURRENT_DESKTOP with commit 4daf68eb + xfce4-session-adapt-session-scripts.patch +- Use autosetup for simpler quilt setup + refresh add-light-locker-support.patch + +------------------------------------------------------------------- +Wed Oct 24 08:54:47 UTC 2018 - vpereira@suse.com + +- add add-light-locker-support.patch to add support to light-locker + +------------------------------------------------------------------- +Sat Dec 30 13:15:51 UTC 2017 - seife+obs@b1-systems.com + +- add xfce4-session-systemd-user-addons.patch to fix systemd-user + services by exporting XAUTHLOCALHOSTNAME + +------------------------------------------------------------------- +Mon Dec 18 14:51:34 UTC 2017 - crrodriguez@opensuse.org + +- Remove build require on xorg-x11 metapackage +- Add explicit build requires on x11 and atk. + +------------------------------------------------------------------- +Mon Jul 3 14:06:52 UTC 2017 - fvogt@suse.com + +- Do not mark %{_datadir}/xsessions/default.desktop as %ghost, + it needs to be installed as normal file. + +------------------------------------------------------------------- +Wed May 17 14:19:47 UTC 2017 - fvogt@suse.com + +- Use update-alternatives to create default.desktop xsession (boo#1030873) + +------------------------------------------------------------------- +Mon Sep 19 17:55:53 UTC 2016 - robert@linux-source.org + +- xfce4-session-Make-verbose-logging-conditional.patch: + Make verbose logging conditional (boo#999676). + +------------------------------------------------------------------- +Mon Mar 16 08:45:42 UTC 2015 - gber@opensuse.org + +- update to version 4.12.1 + - bump libxfce4ui min to 4.12.1 + - drop check for sessions file before it's written (bxo#11632) + - translation updates + +------------------------------------------------------------------- +Sat Feb 28 21:39:29 UTC 2015 - gber@opensuse.org + +- update to version 4.12.0 + - Remove AC_CHECK_HEADER_STDBOOL, it was only + added in autoconf 2.69 and we dont use + stdbool.h anyway + - Add symlinks to the old icons (bxo#11513) + - Rename action icon names (bxo#11513) + - Gracefully handle the sessions dir being + readonly (bxo#11307) + - Add ConsoleKit2 support + - Create scripts/xinitrc from scripts/xinitrc.in created by + configure + - Translation updates + +------------------------------------------------------------------- +Mon Dec 1 13:07:19 UTC 2014 - gber@opensuse.org + +- update to version 4.11.1 + - Add DesktopNames to .desktop file + - Export XDG_CURRENT_DESKTOP (Bug #11239) + - Expand usage of xfsm_verbose for debugging + - Don't log errors when trying to close non-existent FDs + - Add error checking for fcntl + - Properly print the dbus error message + - Check the return value of select + - atoi (argv[2]) is unsafe + - Check the return value of gtk_tree_selection_get_selected + - gtk_cell_renderer_text_new is never used + - Minor Autotools Updates + - Add fallback DragonflyBSD support for suspend/hibernate + - Use pkexec for xfsm-shutdown (Bug 9952) + - Handle gpg and ssh agents separately + Patch by Mikhail Efremov + - Non-POSIX compliant test used in startxfce4 (Bug 10828) + Patch by seejay + - Update copyright year (Bug 10768) + - polkit_unix_process_new is deprecated (Bug 10793) + Patch by Baurzhan Muftakhidinov + - Add logind runtime detection to support suspend/hibernate + (Bug 9952) Patch by Guido Berhoerster + - Translation Updates +- drop obsolete + xfce4-session-systemd-suspend-hibernate-support.patch, + xfce4-session-set-desktop-name.patch, + xfce4-session-4.10.1-fix-bashisms.patch + +------------------------------------------------------------------- +Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org + +- fix typo in xfce4-session-set-desktop-name.patch.changes, + DesktopNames instead of DesktopName + +------------------------------------------------------------------- +Sun Oct 19 18:35:00 UTC 2014 - Led + +- fix bashisms in startxfce4 script (bxo#10828) +- add patches: + * xfce4-session-4.10.1-fix-bashisms.patch (backported from + upstream git) + +------------------------------------------------------------------- +Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org + +- add xfce4-session-set-desktop-name.patch.changes in order to set + the DesktopName property in the xsession file (bxo#11239) + +------------------------------------------------------------------- +Sun Oct 19 08:17:58 UTC 2014 - gber@opensuse.org + +- modify xfce4-session-adapt-session-scripts.patch to set + XDG_CURRENT_DESKTOP (bxo#11239) + +------------------------------------------------------------------- +Thu May 1 08:24:20 UTC 2014 - gber@opensuse.org + +- update to version 4.11.0 + - remove gnome-keyring remains + - remove xfce environment functions and use glib + - add shutdown/reboot functionality for systemd (bxo#8729) + - fix duplicated accelerators + - use the async spawn function of glib + - store the watch function id to avoid possible double free + (bxo#9709) + - translation updates + +------------------------------------------------------------------- +Thu Oct 10 13:20:46 UTC 2013 - rmilasan@suse.com + +- Add requires iceauth package. xfce4-session uses iceauth for + authorization (bnc#845264). + +------------------------------------------------------------------- +Tue Aug 6 17:43:56 UTC 2013 - gber@opensuse.org + +- add xfce4-session-systemd-suspend-hibernate-support.patch in + order to add systemd suspend/hibernate support (bnc#9952) + +------------------------------------------------------------------- +Fri Jun 7 09:28:05 UTC 2013 - gber@opensuse.org + +- drop obsolete configure switches + +------------------------------------------------------------------- +Sun May 5 19:02:45 UTC 2013 - gber@opensuse.org + +- update to version 4.10.1 + - remove xfce environment functions and use glib + - add shutdown/reboot functionality for systemd + - fix logic of the --fast action + - bump copyright year + - store the child watch id to avoid possible double free + - use the async spawn function of glib + - autotools updates + - remove gnome-keyring remains + - handle multiple interactive session save + - translation updates +- remove obsolete xfce4-session-avoid-possible-double-free.patch, + xfce4-session-handle-multiple-interactive-session-save.patch + +------------------------------------------------------------------- +Mon Apr 29 14:35:05 UTC 2013 - gber@opensuse.org + +- add xfce4-session-avoid-possible-double-free.patch in order to + avoid a possible double free crash (bxo#9709, backported from + upstream git) + +------------------------------------------------------------------- +Tue Feb 26 06:56:50 UTC 2013 - gber@opensuse.org + +- removed systemd workaround in + xfce4-session-adapt-session-scripts.patch now that + xfce4-power-manager is patched + +------------------------------------------------------------------- +Tue Dec 18 10:50:34 UTC 2012 - gber@opensuse.org + +- changed xfce4-session-adapt-session-scripts.patch so that it the + session is wrapped with systemd-inhibit in order to work around + systemd's broken defaults of handling suspend/hibernate-keys and + the lidswitch which interferes with xfce4-power-manager + (bnc#789057), this unconditionally disables systemd's handling of + these keys regardless of its settings or whether + xfce4-power-manager actually runs in the session or not + +------------------------------------------------------------------- +Fri Sep 28 13:25:45 UTC 2012 - gber@opensuse.org + +- explicitly depend on ConsoleKit-x11 which is used via DBus + +------------------------------------------------------------------- +Fri Aug 31 22:44:55 UTC 2012 - gber@opensuse.org + +- add xfce4-session-handle-multiple-interactive-session-save.patch + in order to handle multiple interactive session save correctly, + this should fix a lot of cases where xfwm4 was not saved and + thus missing in the next session (bxo#5379) + +------------------------------------------------------------------- +Fri Aug 31 22:34:50 UTC 2012 - gber@opensuse.org + +- add build dependency on libICE and iceauth in order to fix the + build on Factory + +------------------------------------------------------------------- +Wed May 16 10:07:49 UTC 2012 - gber@opensuse.org + +- renamed xfce4-session-adapt-session-script.patch to + xfce4-session-adapt-session-script.patch + - remove bashisms from xinitrc + - do not modify XDG_CONFIG_DIRS and XDG_DATA_DIRS unless + necessary in startxfce4 + - deliver %{_datadir}/xfce and add it to XDG_DATA_DIRS before + %{_datadir} to allow for Xfce-specific defaults + +------------------------------------------------------------------- +Sun Apr 29 08:53:51 UTC 2012 - gber@opensuse.org + +- update to version 4.10.0 + - remove remaining code to shutdown gconf + - skip gpg/ssh-agent if GNOME compat is enabled and gnome-keyring + found + - replace mkdirhier with mkdir + - translation updates + +------------------------------------------------------------------- +Fri Apr 20 13:45:50 UTC 2012 - gber@opensuse.org + +- update to version 4.9.2 + - make the buttons sensitive when using sudo + - restore ssh and gpg agent starting + - translation updates + +------------------------------------------------------------------- +Thu Apr 19 21:51:58 UTC 2012 - gber@opensuse.org + +- obsolete all xfce-utils subpackages packages properly +- obsolete xfce4-session-doc as well + +------------------------------------------------------------------- +Thu Apr 19 12:59:20 UTC 2012 - gber@opensuse.org + +- change license to GPL-2.0 (bnc#758033) + +------------------------------------------------------------------- +Thu Apr 19 08:43:03 UTC 2012 - gber@opensuse.org + +- let -devel depend on libxfsm-4_6-0 rather than the main package + +------------------------------------------------------------------- +Sat Apr 14 16:22:29 UTC 2012 - gber@opensuse.org + +- removed leftover dependency on xfce-utils +- recommend a minimal selection of packages for a Xfce session + +------------------------------------------------------------------- +Sat Apr 14 10:31:48 UTC 2012 - gber@opensuse.org + +- update to version 4.9.1 + - fix return value of CanSuspend and CanHibernate + - make common no-reply error more subtile + - bump package dependency versions + - remove deprecated or unused code from xinit + - fallback to old method for shutdown + - improve xflock4 script + - drop the sync code because it can segfault on ext2 + - always escape name and comment in dialog + - translation updates +- drop xflock4.sh which has been included upstream + +------------------------------------------------------------------- +Sun Apr 8 15:25:47 UTC 2012 - gber@opensuse.org + +- update to version 4.9.0 + - add accelerators to logout dialog buttons + - add support for starting assistive technologies + - remove optional dependency for gconf + - remove Xfce4-tips + - remove early xfsettingsd autostart and add it to the session + - fix crash if save timeout for a client is triggered + - add a way to delete sessions + - drop usage of G_CONST_RETURN macro + - add Xft.xrdb, startxfce4, xinit, xfce.desktop and xflock4 + files from xfce-utils + - explicitly link to libm where needed + - remove the xfce4-panel logout menu plugin + - don't try to remove the $HOME directory + - remove manual and link to docs.xfce.org + - Show dialog in settings category + - link to gmodule + - improve fadeout code with compositing enabled + - start screensaver with autostart + - support the TryExec key for autostart in the settings dialog + - rework the logout dialog code + - cleanup the power management code + - let xfce4-session handle the dbus-launch checking + - add support for launching xfce4-session in consolekit + - add --with-ck-launch support to startxfce4 + - add option to lock the screen on suspend/hibernate + - remove unused icons + - show all applications in autostart + - drop gpg-agent and ssh-agent handling + - translation updates +- dropped xfce4-session-fix-gnome-mode.patch since upstream + provides an improved implementation +- dropped obsolete + xfce4-session-respect-session-save-setting.patch, + xfce4-session-lock-screen-on-suspend-hibernate.patch +- added xfce4-session-adapt-session-script.patch in order to adapt + the upstream sessions script to openSUSE + +------------------------------------------------------------------- +Fri Mar 30 14:03:39 UTC 2012 - gber@opensuse.org + +- specfile cleanup +- corrected dependencies +- split off libxfsm-4_6-0, -doc and -lang subpackages +- added xfce4-session-respect-session-save-setting.patch in order + to respect the value of the "/general/SaveOnExit" option from + xfce4-session in the logout panel plugin as well (bxo#7915) + +------------------------------------------------------------------- +Mon Feb 20 13:20:27 UTC 2012 - gber@opensuse.org + +- added missing build dependency on libSM-devel + +------------------------------------------------------------------- +Sun Feb 12 20:27:03 UTC 2012 - gber@opensuse.org + +- update to version 4.8.3 + - link to gmodule + - translation updates +- dropped obsolete xfce4-session-fix-libgmodule-underlinking.patch + +------------------------------------------------------------------- +Fri Jan 13 17:04:56 UTC 2012 - gber@opensuse.org + +- added xfce4-session-fix-libgmodule-underlinking.patch in order to + explicitly link against libgmodule + +------------------------------------------------------------------- +Thu Dec 15 15:58:02 UTC 2011 - gber@opensuse.org + +- improve xfce4-session-lock-screen-on-suspend-hibernate.patch and + only lock the screen if xfce4-power-manager is configured to do + so and execute xflock4 synchronously + +------------------------------------------------------------------- +Wed Dec 14 13:18:26 UTC 2011 - gber@opensuse.org + +- added xfce4-session-lock-screen-on-suspend-hibernate.patch in + order to try to locking the screen when hibernating/suspending + (bxo#6019) + +------------------------------------------------------------------- +Sun Nov 13 17:33:24 UTC 2011 - gber@opensuse.org + +- fixed xfce4-session-fix-gnome-mode.patch to prevent NULL pointer + dereference on invalid autostart files (bnc#730059) + +------------------------------------------------------------------- +Fri Oct 21 11:47:24 UTC 2011 - gber@opensuse.org + +- install HTML documentation under + /usr/share/xfce4/xfce4-session/html + +------------------------------------------------------------------- +Sat Oct 8 16:22:18 UTC 2011 - gber@opensuse.org + +- added xfce4-session-fix-gnome-mode.patch which removes obsolete + GNOME compatibility code, treats GNOME-/KDE-only autostart files + as inactive, and allows to enable them through + xfce4-session-settings (bnc#710038, bxo#8014) + +------------------------------------------------------------------- +Mon Sep 19 13:38:57 UTC 2011 - gber@opensuse.org + +- update to version 4.8.2 + - drop usage of G_CONST_RETURN macro + - don't exit the session on dbus restarts + - start KDE4 services instead of KDE3 + - reduce size of splash engines + - remove the nopreview image + - add Greek manual screenshots + - on installation create relative paths in symlinks to images + - only perform hostname checks when TCP connections are enabled + - bugfixes + - translation updates +- dropped obsolete xfce4-session-4.8.1-fix-gdm_lang-usage.patch, + xfce4-session-4.8.1-disable-hostname-check.patch + +------------------------------------------------------------------- +Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org + +- added xfce4-session-4.8.1-disable-hostname-check.patch so + hostname checks are only performed when TCP connections are + enabled + +------------------------------------------------------------------- +Tue May 17 09:03:24 UTC 2011 - gber@opensuse.org + +- added xfce4-session-4.8.1-fix-gdm_lang-usage.patch which fixes + GDM_LANG usage to be compatible with GDM3 (bnc#694203, bxo#7400) + +------------------------------------------------------------------- +Fri Apr 1 19:20:50 UTC 2011 - gber@opensuse.org + +- update to version 4.8.1 + - added missing license information + - bugfixes + - translation updates +- dropped obsolete + xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch, + xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch, + xfce4-session-4.8.0-fix-fast-cli-option.patch, and + xfce4-session-4.7.1-fix-missing-include.patch + +------------------------------------------------------------------- +Fri Feb 18 00:16:17 UTC 2011 - gber@opensuse.org + +- call %desktop_database_post/un +- call %icon_theme_cache_post/un + +------------------------------------------------------------------- +Thu Feb 3 19:00:53 UTC 2011 - gber@opensuse.org + +- added xfce4-session-4.8.0-fix-fast-cli-option.patch which fixes + the use of the --fast cli option with other options +- added + xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch + which fixes the error popup when clicking a session menu item +- added xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch + in order to prevent visual inconsistencies in the logout dialog + +------------------------------------------------------------------- +Wed Feb 2 17:45:56 UTC 2011 - gber@opensuse.org + +- added xfce4-session-simple-splash-remove-shadows.patch which + improves readability of the simple splash engine text by removing + the text shadows +- enabled support for GNOME keyring and assistive technologies +- generate documentation + +------------------------------------------------------------------- +Mon Jan 17 12:28:31 UTC 2011 - gber@opensuse.org + +- update to version 4.8.8 + - bugfixes + +------------------------------------------------------------------- +Tue Jan 11 16:24:27 UTC 2011 - gber@opensuse.org + +- removed dependency on xfconf + +------------------------------------------------------------------- +Wed Jan 5 14:24:30 UTC 2011 - gber@opensuse.org + +- use consistent wording for branding packages + +------------------------------------------------------------------- +Mon Dec 27 18:08:49 UTC 2010 - gber@opensuse.org + +- show compiler output + +------------------------------------------------------------------- +Mon Dec 27 17:21:49 UTC 2010 - gber@opensuse.org + +- use %%suse_update_desktop_file for files in /etc/xdg/autostart + +------------------------------------------------------------------- +Mon Dec 27 16:27:39 UTC 2010 - gber@opensuse.org + +- fixed typo + +------------------------------------------------------------------- +Mon Dec 27 16:12:03 UTC 2010 - gber@opensuse.org + +- add proper BRAND comment + +------------------------------------------------------------------- +Mon Dec 27 15:17:25 UTC 2010 - gber@opensuse.org + +- correct url, groups +- improve summaries/descriptions +- remove unsupported locales +- do not install documentation in /usr/share/doc +- moved xfce4-tips-autostart.desktop into the branding supackage in + order to allow disabling startup tips as part of the branding +- remove all libtool files + +------------------------------------------------------------------- +Sun Dec 5 22:06:58 UTC 2010 - prusnak@opensuse.org + +- updated to 4.7.2 + - Do not try "unix-session" authorization with PolicyKit as this + seems to be either broken or not implemented in PolicyKit (bug #6817). + This fixes suspend/hibernate in xfce4-session-logout. + - Fix possibly shadowed variables. + - Fix compilation on FreeBSD with polkit (bug #6870). + - Restore splash screen functionality (bug #6831). + - Fix logout with sudo. + - Translation updates (de, pt_BR, zh_CN, el, uk, it, id, ja, kk, pt). + - Do not try "unix-session" authorization with PolicyKit as this + seems to be either broken or not implemented in PolicyKit (bug #6817). + This fixes suspend/hibernate in xfce4-session-logout. + - Fix possibly shadowed variables. + - Fix compilation on FreeBSD with polkit (bug #6870). + - Restore splash screen functionality (bug #6831). + - Fix logout with sudo. + - Translation updates (de, pt_BR, zh_CN, el, uk, it, id, ja, kk, pt). + +------------------------------------------------------------------- +Fri Dec 3 14:44:54 UTC 2010 - gber@opensuse.org + +- require xfce4-utils + +------------------------------------------------------------------- +Wed Dec 1 18:11:04 UTC 2010 - prusnak@opensuse.org + +- use pkgconfig symbol in BuildRequires + +------------------------------------------------------------------- +Fri Nov 26 16:36:08 UTC 2010 - gber@opensuse.org + +- added xfce4-session-4.7.1-fix-missing-include.patch to fix + missing include + +------------------------------------------------------------------- +Sun Jul 18 13:46:55 CEST 2010 - bernhard@bwalle.de + +- updated to 4.6.2 + o Build fixes for GIT. + o Add timing information to verbose output. + o If it looks like the helper got killed, just return success (bug #4849). + o Translation updates (de, es, gl, hu, id, pl, pt, ru, tr, uk, ro, + lv, ur, ur_PK, ast, sk, nl, it, kk). +- Drop xfce4-session-logout-de.diff: Upstream. + +------------------------------------------------------------------- +Thu May 13 11:54:26 UTC 2010 - bernhard@bwalle.de + +- Fix invalid character in the logout dialog in the German + translation which lead Gtk to not interpret the markup. Instead, + the raw markup code was displayed. + +------------------------------------------------------------------- +Thu Mar 18 09:23:36 UTC 2010 - prusnak@suse.cz + +- build branding subpackage as noarch + +------------------------------------------------------------------- +Thu Dec 10 20:44:31 UTC 2009 - aj@suse.de + +- Remove unused BuildRequires hal-devel + +------------------------------------------------------------------- +Mon Apr 27 10:03:16 CEST 2009 - prusnak@suse.cz + +- updated to 4.6.1 + * Fix crash in settings dialog when a .desktop file with a missing + Application key is opened (bug 5020). + * Ensure networked session handling over TCP is disabled by + default (bug 5126). + +------------------------------------------------------------------- +Mon Mar 2 16:10:39 CET 2009 - prusnak@suse.cz + +- xfce4-tips prints tips without calling fortune (tips-no-fortune.patch) + +------------------------------------------------------------------- +Wed Jan 28 15:02:30 CET 2009 - crrodriguez@suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- +Tue Nov 18 14:10:07 CET 2008 - pnemec@suse.cz + +- call update_desktop_file macro on desktop files [bnc#445722] + +------------------------------------------------------------------- +Fri Nov 14 15:40:11 CET 2008 - prusnak@suse.cz + +- updated suspend_hibernate.patch and renamed to logout-dialog + * adds switch user button, only works with gdm +- fixed crash in autostart-editor (autostart-editor-crash.patch) + +------------------------------------------------------------------- +Wed Oct 29 22:05:46 CET 2008 - bwalle@suse.de + +- update to 4.4.3 + * translation polish + * added icons + +------------------------------------------------------------------- +Thu Aug 21 14:25:30 CEST 2008 - prusnak@suse.cz + +- added patch for parallel start (faster-start.patch) + +------------------------------------------------------------------- +Tue Dec 4 11:54:15 CET 2007 - prusnak@suse.cz + +- use %find_lang macro + +------------------------------------------------------------------- +Mon Dec 3 22:14:40 CET 2007 - bwalle@suse.de + +- update to 4.4.2 + o Updated and new translations + +------------------------------------------------------------------- +Sat Jun 23 23:13:07 CEST 2007 - bwalle@suse.de + +- replaced group 'System/GUI/Other' by 'System/GUI/XFCE' + +------------------------------------------------------------------- +Tue May 22 11:50:34 CEST 2007 - prusnak@suse.cz + +- include 3 files to package +- sync with BuildService + +------------------------------------------------------------------- +Mon Apr 16 00:29:04 CEST 2007 - bwalle@suse.de + +- fix build + +------------------------------------------------------------------- +Tue Apr 10 23:53:18 CEST 2007 - bwalle@suse.de + +- update to 4.4.1 (no upstream changelog for this subpackage) + +------------------------------------------------------------------- +Sat Mar 3 13:09:30 CET 2007 - aj@suse.de + +- /etc/xdg/autostart is part of filesystem now. + +------------------------------------------------------------------- +Sun Jan 21 22:31:06 CET 2007 - bwalle@suse.de + +- upgraded to 4.4.0 + +------------------------------------------------------------------- +Wed Feb 8 14:47:25 CET 2006 - pnemec@suse.cz + +- added xfce4-desktop and xfwm to requires + +------------------------------------------------------------------- +Wed Jan 25 21:43:06 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sat Jan 21 17:44:15 CET 2006 - cthiel@suse.de + +- really update to 4.2.3 + +------------------------------------------------------------------- +Mon Jan 16 23:58:05 CET 2006 - pnemec@suse.cz + +- update to 4.2.3 + +------------------------------------------------------------------- +Wed Sep 14 22:21:37 CEST 2005 - cthiel@suse.de + +- specfile cleanup + +------------------------------------------------------------------- +Mon Aug 1 15:33:07 CEST 2005 - cthiel@suse.de + +- fixed Requires + +------------------------------------------------------------------- +Wed May 18 11:58:50 CEST 2005 - cthiel@suse.de + +- update to 4.2.2 + +------------------------------------------------------------------- +Tue Apr 12 17:27:10 CEST 2005 - cthiel@suse.de + +- initial version + diff --git a/xfce4-session.spec b/xfce4-session.spec new file mode 100644 index 0000000..8f9834d --- /dev/null +++ b/xfce4-session.spec @@ -0,0 +1,200 @@ +# +# spec file for package xfce4-session +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%bcond_with git +Name: xfce4-session +Version: 4.20.0 +Release: 0 +Summary: Xfce Session Manager +License: GPL-2.0-only +Group: System/GUI/XFCE +URL: https://docs.xfce.org/xfce/xfce4-session/start +Source0: https://archive.xfce.org/src/xfce/xfce4-session/4.20/%{name}-%{version}.tar.bz2 +Source1: xfce-portals.conf +Source2: xdg-current-desktop-xfce.desktop +%if %{with git} +# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts-git.patch bnc#789057 maurizio.galli@gmail.com-- Adapt upstream sessions script to openSUSE. +Patch0: xfce4-session-adapt-session-scripts-git.patch +%else +# 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 +%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 +BuildRequires: fdupes +BuildRequires: gettext >= 0.19.8 +BuildRequires: iceauth +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools +BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gdk-wayland-3.0) >= 3.24.0 +BuildRequires: pkgconfig(gdk-x11-3.0) >= 3.24.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.72.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-layer-shell-0) >= 0.7.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 +BuildRequires: pkgconfig(ice) >= 1.0.9 +BuildRequires: pkgconfig(libwnck-3.0) >= 3.10 +BuildRequires: pkgconfig(libxfce4panel-2.0) +BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.4 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.19.2 +BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0 +BuildRequires: pkgconfig(libxfce4windowing-0) >= 4.19.2 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 +BuildRequires: pkgconfig(sm) >= 1.2.2 +BuildRequires: pkgconfig(x11) >= 1.6.5 +Requires: %{name}-branding +Requires: systemd +Requires: xfce4-settings +Requires: xfconf +# bnc#845264 +Requires: iceauth +Requires(post): update-alternatives +Requires(postun):update-alternatives +Recommends: %{name}-doc = %{version} +Recommends: %{name}-lang = %{version} +# minimal packages for an Xfce session +Recommends: xfwm4 +Recommends: thunar +Recommends: xfce4-panel +Recommends: xfdesktop +# xfce4-about needs to be dragged at a low level +Recommends: libxfce4ui-tools +Obsoletes: libxfsm-4_6-0 < %{version} +Obsoletes: xfce4-session-devel < %{version} +# For flatpaks to work properly (boo#1215641) +Recommends: xdg-desktop-portal-gtk + +%description +xfce4-session is the session manager for the Xfce desktop environment. + +%package branding-upstream +Summary: Upstream Branding of xfce4-session +Group: System/GUI/XFCE +Supplements: packageand(%{name}:branding-upstream) +Conflicts: otherproviders(%{name}-branding) +Provides: %{name}-branding = %{version} +# BRAND: xfce4-session.xml: Control session parameters such as the tools and +# BRAND: applications started by default or the splash theme. +BuildArch: noarch + +%description branding-upstream +This package provides the upstream look and feel for the Xfce Session Manager. + +%package wayland-experimental +Summary: Xfce Session Manager for Wayland +Group: System/GUI/XFCE +Requires: %{name} = %{version} +Requires: labwc + +%description wayland-experimental +xfce4-wayland-experimental-session is the Wayland session manager +for the Xfce desktop environment. + +%lang_package + +%prep +%autosetup -p1 + +%build +%if %{with git} +NOCONFIGURE=1 ./autogen.sh +%configure \ + --enable-maintainer-mode \ + --disable-static +%else +%configure \ + --disable-static +%endif +%make_build + +%install + +# Install xfce-portals.conf (boo#1215641) +install -Dpm 0644 -t %{buildroot}%{_datadir}/xdg-desktop-portal/ %{SOURCE1} + +# Ensure XDG_CURRENT_DESKTOP environment variable is exposed when Xfce starts (boo#1215641) +install -Dpm 0644 -t %{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE2} + +%make_install + +%fdupes -s %{buildroot}%{_datadir}/icons/hicolor/* + +chmod 755 %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc + +install -d -m 755 %{buildroot}%{_datadir}/xfce/applications + +# add back X-XFCE for now; this is a personal and not a system setting +%suse_update_desktop_file -r xfce-session-settings XFCE X-XFCE GTK Settings DesktopSettings X-XFCE-SettingsDialog X-XFCE-PersonalSettings +%suse_update_desktop_file xfce4-session-logout + +%find_lang %{name} + +find %{buildroot} -type f -name "*.la" -delete -print +# not needed, shutdown/reboot happens via systemd +rm %{buildroot}%{_datadir}/polkit-1/actions/org.xfce.session.policy \ + %{buildroot}%{_libdir}/xfce4/session/xfsm-shutdown-helper + +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + +%post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/xfce.desktop 20 + +%postun +[ -f %{_datadir}/xsessions/xfce.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/xfce.desktop + +%files +%license COPYING +%doc AUTHORS NEWS README.md +%config %{_sysconfdir}/xdg/xfce4/Xft.xrdb +%{_sysconfdir}/xdg/xfce4/xinitrc +%config %{_sysconfdir}/xdg/autostart/xdg-current-desktop-xfce.desktop +%{_bindir}/xfce4-session +%{_bindir}/xfce4-session-logout +%{_bindir}/xfce4-session-settings +%{_bindir}/xflock4 +%{_bindir}/startxfce4 +%{_datadir}/xsessions/xfce.desktop +%{_datadir}/xsessions/default.desktop +%ghost %{_sysconfdir}/alternatives/default.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop +%{_datadir}/applications/*.desktop +%{_datadir}/icons/*/*/* +%doc %{_mandir}/man1/xfce4-session*.1* +%dir %{_datadir}/xdg-desktop-portal +%{_datadir}/xdg-desktop-portal/xfce-portals.conf + +%files lang -f %{name}.lang + +%files branding-upstream +%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml + +%files wayland-experimental +%dir %{_datadir}/wayland-sessions +%{_datadir}/wayland-sessions/xfce-wayland.desktop + +%changelog From c7169693571c5b591325f012d59868e41a16311b51c07bef268e154657882ff7 Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Fri, 20 Dec 2024 18:19:29 +0000 Subject: [PATCH 2/2] - 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 --- xfce4-session.changes | 6 ++++++ xfce4-session.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index 56981c3..68d9c3e 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 20 10:28:13 UTC 2024 - Manfred Hollstein + +- Add xwayland as a required package for the new subpackage + xfce4-session-wayland-experimental + ------------------------------------------------------------------- Sun Dec 15 14:19:18 UTC 2024 - Manfred Hollstein diff --git a/xfce4-session.spec b/xfce4-session.spec index 8f9834d..64701d3 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -51,15 +51,15 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.72.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-layer-shell-0) >= 0.7.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 +BuildRequires: pkgconfig(gtk-layer-shell-0) >= 0.7.0 BuildRequires: pkgconfig(ice) >= 1.0.9 BuildRequires: pkgconfig(libwnck-3.0) >= 3.10 BuildRequires: pkgconfig(libxfce4panel-2.0) BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.4 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.12.0 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 BuildRequires: pkgconfig(sm) >= 1.2.2 BuildRequires: pkgconfig(x11) >= 1.6.5 @@ -70,7 +70,7 @@ Requires: xfconf # bnc#845264 Requires: iceauth Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: %{name}-doc = %{version} Recommends: %{name}-lang = %{version} # minimal packages for an Xfce session @@ -106,6 +106,7 @@ 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