commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2020-03-30 23:02:23 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.3160 (New) Package is "xfce4-session" Mon Mar 30 23:02:23 2020 rev:84 rq:789519 version:4.14.2 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2020-01-12 23:26:24.190860931 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.3160/xfce4-session.changes 2020-03-30 23:02:24.860142710 +0200 @@ -1,0 +2,8 @@ +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 + +--- Old: xfce4-session-4.14.1.tar.bz2 New: xfce4-session-4.14.2.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.4mPVlD/_old 2020-03-30 23:02:25.900143303 +0200 +++ /var/tmp/diff_new_pack.4mPVlD/_new 2020-03-30 23:02:25.908143307 +0200 @@ -18,7 +18,7 @@ %bcond_with git Name: xfce4-session -Version:4.14.1 +Version:4.14.2 Release:0 Summary:Xfce Session Manager License:GPL-2.0-only ++ xfce4-session-4.14.1.tar.bz2 -> xfce4-session-4.14.2.tar.bz2 ++ 2480 lines of diff (skipped)
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2020-01-12 23:24:46 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.6675 (New) Package is "xfce4-session" Sun Jan 12 23:24:46 2020 rev:83 rq:763651 version:4.14.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2019-08-20 10:59:26.204655688 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.6675/xfce4-session.changes 2020-01-12 23:26:24.190860931 +0100 @@ -1,0 +2,8 @@ +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 + +--- Old: xfce4-session-4.14.0.tar.bz2 New: xfce4-session-4.14.1.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.yaf0E6/_old 2020-01-12 23:26:24.638861097 +0100 +++ /var/tmp/diff_new_pack.yaf0E6/_new 2020-01-12 23:26:24.638861097 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,16 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_with git Name: xfce4-session -Version:4.14.0 +Version:4.14.1 Release:0 Summary:Xfce Session Manager -License:GPL-2.0 +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.14/%{name}-%{version}.tar.bz2 @@ -36,12 +36,13 @@ # PATCH-FIX-OPENSUSE add-light-locker-support.patch -- add light-locker to xflock4 script. Patch3: add-light-locker-support.patch %endif +BuildRequires: fdupes BuildRequires: iceauth BuildRequires: intltool -BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools +BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gmodule-2.0) @@ -55,7 +56,6 @@ BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(atk) Requires: %{name}-branding = %{version} Requires: systemd Requires: xfce4-settings @@ -73,8 +73,8 @@ Recommends: xfce4-panel # xfce4-about needs to be dragged at a low level Recommends: libxfce4ui-tools -Obsoletes: xfce4-session-devel < %{version} Obsoletes: libxfsm-4_6-0 < %{version} +Obsoletes: xfce4-session-devel < %{version} %description xfce4-session is the session manager for the Xfce desktop environment. ++ xfce4-session-4.14.0.tar.bz2 -> xfce4-session-4.14.1.tar.bz2 ++ 30215 lines of diff (skipped)
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2019-08-20 10:59:22 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.22127 (New) Package is "xfce4-session" Tue Aug 20 10:59:22 2019 rev:82 rq:724168 version:4.14.0 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2019-06-12 13:13:42.996853331 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.22127/xfce4-session.changes 2019-08-20 10:59:26.204655688 +0200 @@ -1,0 +2,144 @@ +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 sys
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2019-06-12 13:13:41 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.4811 (New) Package is "xfce4-session" Wed Jun 12 13:13:41 2019 rev:81 rq:708409 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2019-04-02 09:23:39.564764420 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.4811/xfce4-session.changes 2019-06-12 13:13:42.996853331 +0200 @@ -1,0 +2,7 @@ +Wed Jun 5 23:59:55 UTC 2019 - maurizio.ga...@gmail.com + +- Removed add-light-locker-support.patch. Replaced by + additional-lockers-support.patch which supports both + xfce4-screensaver and lightlocker + +--- Old: add-light-locker-support.patch New: additional-lockers-support.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.TC4blg/_old 2019-06-12 13:13:43.508852794 +0200 +++ /var/tmp/diff_new_pack.TC4blg/_new 2019-06-12 13:13:43.512852791 +0200 @@ -34,7 +34,8 @@ Patch2: xfce4-session-Make-verbose-logging-conditional.patch # PATCH-FIX-OPENSUSE xfce4-session-systemd-user-addons.patch seife+...@b1-systems.com -- fix systemd-user session settings Patch3: xfce4-session-systemd-user-addons.patch -Patch4: add-light-locker-support.patch +# PATCH-FIX-OPENSUSE additional-lockers-support.patch maurizio.ga...@gmail.com -- add xfce4-screensaver and lightlocker to xflock4 script +Patch4: additional-lockers-support.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files ++ additional-lockers-support.patch ++ diff -ru a/scripts/xflock4 b/scripts/xflock4 --- a/scripts/xflock4 2014-08-31 02:24:02.0 +0800 +++ b/scripts/xflock4 2019-06-06 07:52:48.399462547 +0800 @@ -26,7 +26,9 @@ # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ +"xfce4-screensaver-command -l" \ "xscreensaver-command -lock" \ +"light-locker-command -l" \ "gnome-screensaver-command --lock" do $lock_cmd >/dev/null 2>&1 && exit
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2019-04-02 09:23:35 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.25356 (New) Package is "xfce4-session" Tue Apr 2 09:23:35 2019 rev:80 rq:690424 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2018-10-25 09:12:56.558268241 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.25356/xfce4-session.changes 2019-04-02 09:23:39.564764420 +0200 @@ -1,0 +2,9 @@ +Sat Mar 30 21:20:52 UTC 2019 - o...@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 + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.XPkzOk/_old 2019-04-02 09:23:40.124764796 +0200 +++ /var/tmp/diff_new_pack.XPkzOk/_new 2019-04-02 09:23:40.128764798 +0200 @@ -116,12 +116,7 @@ %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 +%autosetup -p1 %build xdt-autogen ++ add-light-locker-support.patch ++ --- /var/tmp/diff_new_pack.XPkzOk/_old 2019-04-02 09:23:40.148764811 +0200 +++ /var/tmp/diff_new_pack.XPkzOk/_new 2019-04-02 09:23:40.148764811 +0200 @@ -1,7 +1,5 @@ -Index: scripts/xflock4 -=== scripts/xflock4.orig -+++ scripts/xflock4 +--- a/scripts/xflock4 b/scripts/xflock4 @@ -27,7 +27,8 @@ export PATH # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ ++ xfce4-session-adapt-session-scripts.patch ++ --- /var/tmp/diff_new_pack.XPkzOk/_old 2019-04-02 09:23:40.160764819 +0200 +++ /var/tmp/diff_new_pack.XPkzOk/_new 2019-04-02 09:23:40.160764819 +0200 @@ -1,26 +1,6 @@ -Index: xfce4-session-4.12.1/scripts/xinitrc.in -=== xfce4-session-4.12.1.orig/scripts/xinitrc.in -+++ xfce4-session-4.12.1/scripts/xinitrc.in -@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then - export XDG_MENU_PREFIX - fi - --# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running -+# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if -+# an Xfce session is running - if test "x$DESKTOP_SESSION" = "x"; then - DESKTOP_SESSION="xfce" - export DESKTOP_SESSION - fi -+if test "x$XDG_CURRENT_DESKTOP" = "x"; then -+ XDG_CURRENT_DESKTOP="XFCE" -+ export XDG_CURRENT_DESKTOP -+fi - - # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme - if test "x$XDG_CURRENT_DESKTOP" = "x"; then -@@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- a/scripts/xinitrc.in b/scripts/xinitrc.in +@@ -44,12 +44,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -33,7 +13,7 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" -@@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -87,112 +81,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -158,29 +138,9 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.12.1/scripts/xinitrc.in.in -=== xfce4-session-4.12.1.orig/scripts/xinitrc.in.in -+++ xfce4-session-4.12.1/scripts/xinitrc.in.in -@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then - export XDG_MENU_PREFIX - fi - --# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running -+# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if -+# an Xfce session is running - if test "x$DESKTOP_SESSION" = "x"; then - DESKTOP_SESSION="xfce" - export DESKTOP_SESSION - fi -+if test "x$XDG_CURRENT_DESKTOP" = "x"; then -+ XDG_CURRENT_DESKTOP="XFCE" -+ export XDG_CURRENT_DESKTOP -+fi - - # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme - if test "x$XDG_CURRENT_DESKTOP" = "x"; then -@@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in +@@ -44,12 +44,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -193,7 +153,7 @@ # Modify lib
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2018-10-25 09:12:55 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Thu Oct 25 09:12:55 2018 rev:79 rq:644363 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2017-12-31 19:32:22.011132316 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2018-10-25 09:12:56.558268241 +0200 @@ -1,0 +2,5 @@ +Wed Oct 24 08:54:47 UTC 2018 - vpere...@suse.com + +- add add-light-locker-support.patch to add support to light-locker + +--- New: add-light-locker-support.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.OhJdT1/_old 2018-10-25 09:12:57.314267788 +0200 +++ /var/tmp/diff_new_pack.OhJdT1/_new 2018-10-25 09:12:57.318267786 +0200 @@ -34,6 +34,7 @@ Patch2: xfce4-session-Make-verbose-logging-conditional.patch # PATCH-FIX-OPENSUSE xfce4-session-systemd-user-addons.patch seife+...@b1-systems.com -- fix systemd-user session settings Patch3: xfce4-session-systemd-user-addons.patch +Patch4: add-light-locker-support.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -120,6 +121,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p0 %build xdt-autogen ++ add-light-locker-support.patch ++ Index: scripts/xflock4 === --- scripts/xflock4.orig +++ scripts/xflock4 @@ -27,7 +27,8 @@ export PATH # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ "xscreensaver-command -lock" \ -"gnome-screensaver-command --lock" +"gnome-screensaver-command --lock" \ +"light-locker-command -l" do $lock_cmd >/dev/null 2>&1 && exit done
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2017-12-31 19:32:18 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Sun Dec 31 19:32:18 2017 rev:78 rq:560753 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2017-12-19 10:59:31.634338757 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2017-12-31 19:32:22.011132316 +0100 @@ -1,0 +2,6 @@ +Sat Dec 30 13:15:51 UTC 2017 - seife+...@b1-systems.com + +- add xfce4-session-systemd-user-addons.patch to fix systemd-user + services by exporting XAUTHLOCALHOSTNAME + +--- New: xfce4-session-systemd-user-addons.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WVx5Xb/_old 2017-12-31 19:32:22.802868182 +0100 +++ /var/tmp/diff_new_pack.WVx5Xb/_new 2017-12-31 19:32:22.802868182 +0100 @@ -32,6 +32,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-Make-verbose-logging-conditional.patch boo#999676 Patch2: xfce4-session-Make-verbose-logging-conditional.patch +# PATCH-FIX-OPENSUSE xfce4-session-systemd-user-addons.patch seife+...@b1-systems.com -- fix systemd-user session settings +Patch3: xfce4-session-systemd-user-addons.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -117,6 +119,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build xdt-autogen ++ xfce4-session-systemd-user-addons.patch ++ Set XAUTHLOCALHOSTNAME in systemd user session, or starting of systemd-activated services will fail. Observed on openSUSE-Tumbleweed-Rescue-CD-x86_64-Snapshot20171213-Media.iso Index: b/scripts/xinitrc.in === --- a/scripts/xinitrc.in +++ b/scripts/xinitrc.in @@ -86,6 +86,10 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap +# if XAUTHLOCALHOSTNAME is not set in systemd user session, starting of xfce4-notifyd etc. will fail +if systemctl --user list-jobs >/dev/null 2>&1; then # user session is running + dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME +fi # 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 Index: b/scripts/xinitrc.in.in === --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -86,6 +86,10 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap +# if XAUTHLOCALHOSTNAME is not set in systemd user session, starting of xfce4-notifyd etc. will fail +if systemctl --user list-jobs >/dev/null 2>&1; then # user session is running + dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME +fi # 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
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2017-12-19 10:59:30 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Tue Dec 19 10:59:30 2017 rev:77 rq:558200 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2017-07-07 10:17:05.453530539 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2017-12-19 10:59:31.634338757 +0100 @@ -1,0 +2,6 @@ +Mon Dec 18 14:51:34 UTC 2017 - crrodrig...@opensuse.org + +- Remove build require on xorg-x11 metapackage +- Add explicit build requires on x11 and atk. + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.U13zEF/_old 2017-12-19 10:59:32.342304580 +0100 +++ /var/tmp/diff_new_pack.U13zEF/_new 2017-12-19 10:59:32.342304580 +0100 @@ -36,7 +36,6 @@ BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools -BuildRequires: xorg-x11 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gmodule-2.0) @@ -49,6 +48,8 @@ BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(atk) Requires: %{name}-branding = %{version} Requires: systemd Requires: xfce4-settings
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2017-07-07 10:17:04 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Fri Jul 7 10:17:04 2017 rev:76 rq:508357 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2017-05-21 12:31:11.756196518 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2017-07-07 10:17:05.453530539 +0200 @@ -1,0 +2,11 @@ +Mon Jul 3 14:06:52 UTC 2017 - fv...@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 - fv...@suse.com + +- Use update-alternatives to create default.desktop xsession (boo#1030873) + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.IQt4zU/_old 2017-07-07 10:17:06.397396987 +0200 +++ /var/tmp/diff_new_pack.IQt4zU/_new 2017-07-07 10:17:06.397396987 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,8 @@ 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 @@ -139,6 +141,10 @@ 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 -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -146,10 +152,14 @@ %post %desktop_database_post %icon_theme_cache_post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/xfce.desktop 20 %postun %desktop_database_postun %icon_theme_cache_postun +[ -f %{_datadir}/xsessions/xfce.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/xfce.desktop %files %defattr(-,root,root) @@ -166,6 +176,8 @@ %{_libdir}/xfce4 %{_datadir}/xfce %{_datadir}/xsessions/xfce.desktop +%{_datadir}/xsessions/default.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/themes/* %{_datadir}/applications/*.desktop %{_datadir}/icons/*/*/*
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2017-05-21 12:31:08 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Sun May 21 12:31:08 2017 rev:75 rq:497076 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2017-05-18 20:48:40.156304237 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2017-05-21 12:31:11.756196518 +0200 @@ -2,5 +1,0 @@ -Wed May 17 14:19:47 UTC 2017 - fv...@suse.com - -- Use update-alternatives to create default.desktop xsession (boo#1030873) - Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.kintrE/_old 2017-05-21 12:31:13.347971812 +0200 +++ /var/tmp/diff_new_pack.kintrE/_new 2017-05-21 12:31:13.351971247 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,8 +55,6 @@ 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 @@ -141,10 +139,6 @@ 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 -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -152,14 +146,10 @@ %post %desktop_database_post %icon_theme_cache_post -%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ - default-xsession.desktop %{_datadir}/xsessions/xfce.desktop 20 %postun %desktop_database_postun %icon_theme_cache_postun -[ -f %{_datadir}/xsessions/xfce.desktop ] || %{_sbindir}/update-alternatives \ - --remove default-xsession.desktop %{_datadir}/xsessions/xfce.desktop %files %defattr(-,root,root) @@ -176,8 +166,6 @@ %{_libdir}/xfce4 %{_datadir}/xfce %{_datadir}/xsessions/xfce.desktop -%ghost %{_datadir}/xsessions/default.desktop -%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/themes/* %{_datadir}/applications/*.desktop %{_datadir}/icons/*/*/*
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2017-05-18 20:48:39 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Thu May 18 20:48:39 2017 rev:74 rq:495664 version:4.12.1 Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2016-09-24 15:29:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2017-05-18 20:48:40.156304237 +0200 @@ -1,0 +2,5 @@ +Wed May 17 14:19:47 UTC 2017 - fv...@suse.com + +- Use update-alternatives to create default.desktop xsession (boo#1030873) + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.oqdNf2/_old 2017-05-18 20:48:40.844207156 +0200 +++ /var/tmp/diff_new_pack.oqdNf2/_new 2017-05-18 20:48:40.848206591 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,8 @@ 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 @@ -139,6 +141,10 @@ 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 -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -146,10 +152,14 @@ %post %desktop_database_post %icon_theme_cache_post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/xfce.desktop 20 %postun %desktop_database_postun %icon_theme_cache_postun +[ -f %{_datadir}/xsessions/xfce.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/xfce.desktop %files %defattr(-,root,root) @@ -166,6 +176,8 @@ %{_libdir}/xfce4 %{_datadir}/xfce %{_datadir}/xsessions/xfce.desktop +%ghost %{_datadir}/xsessions/default.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/themes/* %{_datadir}/applications/*.desktop %{_datadir}/icons/*/*/*
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2016-09-24 15:28:30 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2015-03-18 13:05:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2016-09-24 15:29:15.0 +0200 @@ -1,0 +2,6 @@ +Mon Sep 19 17:55:53 UTC 2016 - rob...@linux-source.org + +- xfce4-session-Make-verbose-logging-conditional.patch: + Make verbose logging conditional (boo#999676). + +--- New: xfce4-session-Make-verbose-logging-conditional.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.8WVVIw/_old 2016-09-24 15:29:17.0 +0200 +++ /var/tmp/diff_new_pack.8WVVIw/_new 2016-09-24 15:29:17.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch +# PATCH-FIX-UPSTREAM xfce4-session-Make-verbose-logging-conditional.patch boo#999676 +Patch2: xfce4-session-Make-verbose-logging-conditional.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -111,6 +113,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build xdt-autogen ++ xfce4-session-Make-verbose-logging-conditional.patch ++ >From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sat, 28 Mar 2015 16:57:24 +0300 Subject: Make verbose logging conditional (Bug #11698) Bug report and patch submitted by Zhihao Yuan Signed-off-by: Eric Koegel diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h index d2e0c29..d458712 100644 --- a/xfce4-session/xfsm-global.h +++ b/xfce4-session/xfsm-global.h @@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen; #if defined(G_HAVE_ISO_VARARGS) #define xfsm_verbose(...)\ -xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__) +G_STMT_START{ \ + if (G_UNLIKELY (verbose)) \ +xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \ +}G_STMT_END #else -- cgit v0.10.1
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2015-03-18 13:05:06 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2015-03-09 10:05:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2015-03-18 13:05:08.0 +0100 @@ -1,0 +2,8 @@ +Mon Mar 16 08:45:42 UTC 2015 - g...@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 + +--- Old: xfce4-session-4.12.0.tar.bz2 New: xfce4-session-4.12.1.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.A95rAq/_old 2015-03-18 13:05:09.0 +0100 +++ /var/tmp/diff_new_pack.A95rAq/_new 2015-03-18 13:05:09.0 +0100 @@ -19,7 +19,7 @@ %define libname libxfsm-4_6-0 Name: xfce4-session -Version:4.12.0 +Version:4.12.1 Release:0 Summary:Xfce Session Manager License:GPL-2.0 ++ xfce4-session-4.12.0.tar.bz2 -> xfce4-session-4.12.1.tar.bz2 ++ 32632 lines of diff (skipped) retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfce4-session-4.12.0/ChangeLog new/xfce4-session-4.12.1/ChangeLog --- old/xfce4-session-4.12.0/ChangeLog 2015-02-28 17:28:40.0 +0100 +++ new/xfce4-session-4.12.1/ChangeLog 2015-03-16 08:29:52.0 +0100 @@ -1,3 +1,37 @@ +commit bf78012c59319443da4e8f241483e338a6a80911 +Author: Eric Koegel +Date: Mon Mar 16 10:24:24 2015 +0300 + +Bump libxfce4ui min to 4.12.1 + +libxfce4ui contains a bugfix for xfsm 4.12 so bump the minimum to +ensure it gets used. + +commit a4620bb65812a7537d35e40c5117407392424f16 +Author: Anonymous +Date: Sat Mar 14 18:30:48 2015 +0100 + +I18n: Update translation lt (100%). + +203 translated messages. + +Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 364342fbd84c924783a415046f813169cf1d1a0a +Author: Eric Koegel +Date: Fri Mar 6 19:55:02 2015 +0300 + +Drop check for sessions file before it's written (Bug #11632) + +Just opening the session file in rc_open doesn't cause a write, +so drop the unneeded check that was breaking session saves. + +commit 66002968143827cf83b6e17276f7a49025f7c84e +Author: Sean Davis +Date: Sat Feb 28 11:33:03 2015 -0500 + +Post release tag bump + commit 8bb68f5a15a45939bd7d567c2e67d5f1d4e42aaf Author: Sean Davis Date: Sat Feb 28 11:25:16 2015 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfce4-session-4.12.0/INSTALL new/xfce4-session-4.12.1/INSTALL --- old/xfce4-session-4.12.0/INSTALL2015-02-28 17:28:14.0 +0100 +++ new/xfce4-session-4.12.1/INSTALL2015-03-16 08:29:44.0 +0100 @@ -1,7 +1,7 @@ Installation Instructions * -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation == - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2015-03-09 10:05:20 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2014-11-06 16:50:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2015-03-09 10:05:22.0 +0100 @@ -1,0 +2,48 @@ +Sat Feb 28 21:39:29 UTC 2015 - g...@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 - g...@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 + +--- @@ -25,0 +74,13 @@ + +--- +Thu May 1 08:24:20 UTC 2014 - g...@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 Old: xfce4-session-4.10.1-fix-bashisms.patch xfce4-session-4.10.1.tar.bz2 xfce4-session-set-desktop-name.patch xfce4-session-systemd-suspend-hibernate-support.patch New: xfce4-session-4.12.0.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.PSmtpA/_old 2015-03-09 10:05:23.0 +0100 +++ /var/tmp/diff_new_pack.PSmtpA/_new 2015-03-09 10:05:23.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,23 +19,17 @@ %define libname libxfsm-4_6-0 Name: xfce4-session -Version:4.10.1 +Version:4.12.0 Release:0 Summary:Xfce Session Manager License:GPL-2.0 Group: System/GUI/XFCE Url:http://docs.xfce.org/xfce/xfce4-session/start -Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.10/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.12/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch -# PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 g...@opensuse.org -- Add systemd suspend/hibernate support -Pa
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2014-11-06 16:50:16 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2014-10-22 16:23:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2014-11-06 16:50:58.0 +0100 @@ -7,0 +8,8 @@ +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) + +--- New: xfce4-session-4.10.1-fix-bashisms.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.l3bPgK/_old 2014-11-06 16:51:00.0 +0100 +++ /var/tmp/diff_new_pack.l3bPgK/_new 2014-11-06 16:51:00.0 +0100 @@ -34,6 +34,8 @@ Patch2: xfce4-session-systemd-suspend-hibernate-support.patch # PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 g...@opensuse.org -- Set DesktopNames property in the xsession file Patch3: xfce4-session-set-desktop-name.patch +# PATCH-FIX-UPSTREAM xfce4-session-4.10.1-fix-bashisms.patch bxo#10828 led...@gmail.com -- Fix bashisms in startxfce4 script (backported from upstream git) +Patch4: xfce4-session-4.10.1-fix-bashisms.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -123,6 +125,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build xdt-autogen ++ xfce4-session-4.10.1-fix-bashisms.patch ++ >From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sun, 20 Jul 2014 18:09:22 +0300 Subject: Non-POSIX compliant test used in startxfce4 (Bug 10828) Patch and bug report by seejay The command line arguments "--help" and "--with-ck-launch" can't be used on systems which have a non-bash /bin/sh (e.g. Debian, as far as I'm aware). This is due to the use of "==" instead of "=" in test commands, which is a bash extension. diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in index b346d8f..d0a74a9 100644 --- a/scripts/startxfce4.in +++ b/scripts/startxfce4.in @@ -24,7 +24,7 @@ then OPTS="" for OPT in $* do -if test "x$OPT" == "x--help" +if test "x$OPT" = "x--help" then # print help and exit echo "Usage:" @@ -37,7 +37,7 @@ then echo exit 0 -elif test "x$OPT" == "x--with-ck-launch" +elif test "x$OPT" = "x--with-ck-launch" then # try to launch xfce4-session with ck-launch-session in xinitrc XFCE4_SESSION_WITH_CK="1" -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2014-10-22 16:23:10 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2014-10-20 07:27:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2014-10-22 16:23:15.0 +0200 @@ -1,0 +2,6 @@ +Mon Oct 20 19:03:13 UTC 2014 - g...@opensuse.org + +- fix typo in xfce4-session-set-desktop-name.patch.changes, + DesktopNames instead of DesktopName + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.Yb7UXd/_old 2014-10-22 16:23:17.0 +0200 +++ /var/tmp/diff_new_pack.Yb7UXd/_new 2014-10-22 16:23:17.0 +0200 @@ -32,7 +32,7 @@ Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 g...@opensuse.org -- Add systemd suspend/hibernate support Patch2: xfce4-session-systemd-suspend-hibernate-support.patch -# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 g...@opensuse.org -- Set DesktopName property in the xsession file +# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 g...@opensuse.org -- Set DesktopNames property in the xsession file Patch3: xfce4-session-set-desktop-name.patch BuildRequires: iceauth BuildRequires: intltool ++ xfce4-session-set-desktop-name.patch ++ --- /var/tmp/diff_new_pack.Yb7UXd/_old 2014-10-22 16:23:17.0 +0200 +++ /var/tmp/diff_new_pack.Yb7UXd/_new 2014-10-22 16:23:17.0 +0200 @@ -6,4 +6,4 @@ Exec=startxfce4 Icon= Type=Application -+DesktopName=XFCE ++DesktopNames=XFCE -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2014-10-20 07:27:13 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-10-11 11:05:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2014-10-20 07:27:14.0 +0200 @@ -1,0 +2,12 @@ +Sun Oct 19 08:27:57 UTC 2014 - g...@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 - g...@opensuse.org + +- modify xfce4-session-adapt-session-scripts.patch to set + XDG_CURRENT_DESKTOP (bxo#11239) + +--- New: xfce4-session-set-desktop-name.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.9h6trv/_old 2014-10-20 07:27:15.0 +0200 +++ /var/tmp/diff_new_pack.9h6trv/_new 2014-10-20 07:27:15.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 g...@opensuse.org -- Add systemd suspend/hibernate support Patch2: xfce4-session-systemd-suspend-hibernate-support.patch +# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 g...@opensuse.org -- Set DesktopName property in the xsession file +Patch3: xfce4-session-set-desktop-name.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -120,6 +122,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build xdt-autogen ++ xfce4-session-adapt-session-scripts.patch ++ --- /var/tmp/diff_new_pack.9h6trv/_old 2014-10-20 07:27:15.0 +0200 +++ /var/tmp/diff_new_pack.9h6trv/_new 2014-10-20 07:27:15.0 +0200 @@ -1,8 +1,26 @@ -Index: xfce4-session-4.10.0/scripts/xinitrc.in +Index: xfce4-session-4.10.1/scripts/xinitrc.in === xfce4-session-4.10.0.orig/scripts/xinitrc.in -+++ xfce4-session-4.10.0/scripts/xinitrc.in -@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- xfce4-session-4.10.1.orig/scripts/xinitrc.in xfce4-session-4.10.1/scripts/xinitrc.in +@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then + export XDG_MENU_PREFIX + fi + +-# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running ++# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if ++# an Xfce session is running + if test "x$DESKTOP_SESSION" = "x"; then + DESKTOP_SESSION="xfce" + export DESKTOP_SESSION + fi ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi + + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set +@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -15,7 +33,7 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -140,11 +158,29 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.10.0/scripts/xinitrc.in.in +Index: xfce4-session-4.10.1/scripts/xinitrc.in.in === xfce4-session-4.10.0.orig/scripts/xinitrc.in.in -+++ xfce4-session-4.10.0/scripts/xinitrc.in.in -@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- xfce4-session-4.10.1.orig/scripts/xinitrc.in.in xfce4-session-4.10.1/scripts/xinitrc.in.in +@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then + export XDG_MENU_PREFIX + fi + +-# set DESKTOP_SESSION so that one c
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-10-11 11:05:16 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-08-10 11:01:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-10-11 11:05:17.0 +0200 @@ -1,0 +2,6 @@ +Thu Oct 10 13:20:46 UTC 2013 - rmila...@suse.com + +- Add requires iceauth package. xfce4-session uses iceauth for + authorization (bnc#845264). + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.Iw1775/_old 2013-10-11 11:05:19.0 +0200 +++ /var/tmp/diff_new_pack.Iw1775/_new 2013-10-11 11:05:19.0 +0200 @@ -67,6 +67,8 @@ %endif Requires: xfce4-settings Requires: xfconf +# bnc#845264 +Requires: iceauth Recommends: %{name}-doc = %{version} Recommends: %{name}-lang = %{version} # minimal packages for an Xfce session -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-08-10 11:01:35 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-06-11 09:38:45.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-08-10 11:01:37.0 +0200 @@ -1,0 +2,6 @@ +Tue Aug 6 17:43:56 UTC 2013 - g...@opensuse.org + +- add xfce4-session-systemd-suspend-hibernate-support.patch in + order to add systemd suspend/hibernate support (bnc#9952) + +--- New: xfce4-session-systemd-suspend-hibernate-support.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.dfmcZ3/_old 2013-08-10 11:01:38.0 +0200 +++ /var/tmp/diff_new_pack.dfmcZ3/_new 2013-08-10 11:01:38.0 +0200 @@ -30,11 +30,12 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch -%if 0%{?suse_version} > 1210 +# PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 g...@opensuse.org -- Add systemd suspend/hibernate support +Patch2: xfce4-session-systemd-suspend-hibernate-support.patch BuildRequires: iceauth -%endif BuildRequires: intltool BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: xorg-x11 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) @@ -59,11 +60,10 @@ Provides: xfce4-session-doc = %{version} Obsoletes: xfce4-session-doc <= 4.8.3 Requires: %{name}-branding = %{version} -%if 0%{?suse_version} < 1230 -Requires: ConsoleKit-x11 -%endif %if 0%{?suse_version} >= 1230 Requires: systemd +%else +Requires: ConsoleKit-x11 %endif Requires: xfce4-settings Requires: xfconf @@ -117,8 +117,10 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build +xdt-autogen %configure \ --disable-static make %{?_smp_mflags} V=1 ++ xfce4-session-systemd-suspend-hibernate-support.patch ++ Index: xfce4-session-4.10.1/configure.ac === --- xfce4-session-4.10.1.orig/configure.ac +++ xfce4-session-4.10.1/configure.ac @@ -103,7 +103,7 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0 dnl Check for polkit / systemd integration XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], - [systemd], [Systemd support (through polit)]) + [systemd], [Systemd support (through polkit)]) dnl Check for debugging support XDT_FEATURE_DEBUG([xfsm_debug_default]) @@ -207,10 +207,10 @@ echo " * Legacy session management: else echo " * Legacy session management: no" fi -if test x"$GNOME_KEYRING_FOUND" = x"yes"; then -echo " * Gnome Keyring support: yes" +if test x"$SYSTEMD_FOUND" = x"yes"; then +echo " * Systemd support (through polkit): yes" else -echo " * Gnome Keyring support: no" +echo " * Systemd support (through polkit): no" fi echo Index: xfce4-session-4.10.1/xfce4-session/Makefile.am === --- xfce4-session-4.10.1.orig/xfce4-session/Makefile.am +++ xfce4-session-4.10.1/xfce4-session/Makefile.am @@ -38,6 +38,8 @@ xfce4_session_SOURCES = \ xfsm-compat-gnome.h \ xfsm-compat-kde.c \ xfsm-compat-kde.h \ + xfsm-consolekit.c \ + xfsm-consolekit.h \ xfsm-dns.c \ xfsm-dns.h \ xfsm-error.c\ @@ -67,10 +69,6 @@ if HAVE_SYSTEMD xfce4_session_SOURCES += \ xfsm-systemd.c \ xfsm-systemd.h -else -xfce4_session_SOURCES += \ - xfsm-consolekit.c \ - xfsm-consolekit.h endif
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-06-11 06:41:04 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-05-02 12:03:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-06-11 09:38:45.0 +0200 @@ -1,0 +2,22 @@ +Fri Jun 7 09:28:05 UTC 2013 - g...@opensuse.org + +- drop obsolete configure switches + +--- +Sun May 5 19:02:45 UTC 2013 - g...@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 + +--- Old: xfce4-session-4.10.0.tar.bz2 xfce4-session-avoid-possible-double-free.patch xfce4-session-handle-multiple-interactive-session-save.patch New: xfce4-session-4.10.1.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.VWk5fI/_old 2013-06-11 09:38:46.0 +0200 +++ /var/tmp/diff_new_pack.VWk5fI/_new 2013-06-11 09:38:46.0 +0200 @@ -19,7 +19,7 @@ %define libname libxfsm-4_6-0 Name: xfce4-session -Version:4.10.0 +Version:4.10.1 Release:0 Summary:Xfce Session Manager License:GPL-2.0 @@ -30,10 +30,6 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch -# PATCH-FIX-UPSTREAM xfce4-session-handle-multiple-interactive-session-save.patch bxo#5379 g...@opensuse.org -- Handle multiple interactive session save correctly (backported from upstream git) -Patch2: xfce4-session-handle-multiple-interactive-session-save.patch -# PATCH-FIX-UPSTREAM xfce4-session-avoid-possible-double-free.patch bxo#9709 g...@opensuse.org -- Avoid a possible double free crash (backported from upstream git) -Patch3: xfce4-session-avoid-possible-double-free.patch %if 0%{?suse_version} > 1210 BuildRequires: iceauth %endif @@ -50,6 +46,9 @@ BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) +%if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 +%endif BuildRequires: pkgconfig(sm) Provides: xfce-utils = %{version} Obsoletes: xfce-utils <= 4.8.3 @@ -60,7 +59,12 @@ Provides: xfce4-session-doc = %{version} Obsoletes: xfce4-session-doc <= 4.8.3 Requires: %{name}-branding = %{version} +%if 0%{?suse_version} < 1230 Requires: ConsoleKit-x11 +%endif +%if 0%{?suse_version} >= 1230 +Requires: systemd +%endif Requires: xfce4-settings Requires: xfconf Recommends: %{name}-doc = %{version} @@ -113,15 +117,10 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure \ ---disable-static \ ---enable-session-screenshots \ ---enable-gnome \ ---enable-libgnome-keyring +--disable-static make %{?_smp_mflags} V=1 %install ++ xfce4-session-4.10.0.tar.bz2 -> xfce4-session-4.10.1.tar.bz2 ++ 20625 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-05-02 12:03:29 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-03-04 17:35:24.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-05-02 12:03:32.0 +0200 @@ -1,0 +2,7 @@ +Mon Apr 29 14:35:05 UTC 2013 - g...@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) + +--- New: xfce4-session-avoid-possible-double-free.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WQHVdC/_old 2013-05-02 12:03:34.0 +0200 +++ /var/tmp/diff_new_pack.WQHVdC/_new 2013-05-02 12:03:34.0 +0200 @@ -32,6 +32,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-handle-multiple-interactive-session-save.patch bxo#5379 g...@opensuse.org -- Handle multiple interactive session save correctly (backported from upstream git) Patch2: xfce4-session-handle-multiple-interactive-session-save.patch +# PATCH-FIX-UPSTREAM xfce4-session-avoid-possible-double-free.patch bxo#9709 g...@opensuse.org -- Avoid a possible double free crash (backported from upstream git) +Patch3: xfce4-session-avoid-possible-double-free.patch %if 0%{?suse_version} > 1210 BuildRequires: iceauth %endif @@ -112,6 +114,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure \ ++ xfce4-session-avoid-possible-double-free.patch ++ Index: xfce4-session-4.10.0/xfce4-session/xfsm-startup.c === --- xfce4-session-4.10.0.orig/xfce4-session/xfsm-startup.c +++ xfce4-session-4.10.0/xfce4-session/xfsm-startup.c @@ -864,6 +864,7 @@ xfsm_startup_start_properties (XfsmPrope gint n; const gchar *current_directory; GPid pid; + GError *error = NULL; /* release any possible old resources related to a previous startup */ xfsm_properties_set_default_child_watch (properties); @@ -878,49 +879,34 @@ xfsm_startup_start_properties (XfsmPrope current_directory = xfsm_properties_get_string (properties, SmCurrentDirectory); - /* fork a new process for the application */ -#ifdef HAVE_VFORK - /* vfork() doesn't allow you to do anything but call exec*() or _exit(), - * so if we need to set the working directory, we can't use vfork() */ - if (current_directory == NULL) -pid = vfork (); - else -#endif -pid = fork (); - - /* handle the child process */ - if (pid == 0) + if (!g_spawn_async (current_directory, + argv, NULL, + G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, + NULL, NULL, + &pid, &error)) { - /* execute the application here */ - if (current_directory) -{ - if (chdir (current_directory)) -g_warning ("Unable to chdir to \"%s\": %s", current_directory, strerror (errno)); -} - execvp (argv[0], argv); - _exit (127); -} - - /* cleanup */ - g_strfreev (argv); + g_warning ("Unable to launch \"%s\": %s", + *argv, error->message); + g_error_free (error); + g_strfreev (argv); - /* check if we failed to fork */ - if (G_UNLIKELY (pid < 0)) -{ - /* tell the user that we failed to fork */ - perror ("Failed to fork new process"); return FALSE; } + xfsm_verbose ("Launched command \"%s\" with PID %dn", *argv, (gint) pid); + + g_strfreev (argv); + properties->pid = pid; /* set a watch to make sure the child doesn't quit before registering */ - child_watch_data = g_new (XfsmStartupData, 1); + child_watch_data = g_new0 (XfsmStartupData, 1); child_watch_data->manager = g_object_ref (manager); child_watch_data->properties = properties; - g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, - xfsm_startup_child_watch, child_watch_data, - (GDestroyNotify) xfsm_startup_data_free); + child_watch_data->properties->child_watch_id = + g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, + xfsm_startup_child_watch, child_watch_data, + (GDestroyNotify) xfsm_startup_data_free); /* set a timeout -- client must register
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-03-04 17:35:23 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-01-29 14:49:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-03-04 17:35:24.0 +0100 @@ -1,0 +2,7 @@ +Tue Feb 26 06:56:50 UTC 2013 - g...@opensuse.org + +- removed systemd workaround in + xfce4-session-adapt-session-scripts.patch now that + xfce4-power-manager is patched + +--- Other differences: -- ++ xfce4-session-adapt-session-scripts.patch ++ --- /var/tmp/diff_new_pack.SjvDH1/_old 2013-03-04 17:35:25.0 +0100 +++ /var/tmp/diff_new_pack.SjvDH1/_new 2013-03-04 17:35:25.0 +0100 @@ -15,14 +15,13 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then -+test -x /usr/bin/systemd-inhibit && SYSTEMD_INHIBIT_CMD="systemd-inhibit --what=idle:handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch " - +- - # 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 @@ -43,7 +42,7 @@ +# 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 ! ck-launch-session $SYSTEMD_INHIBIT_CMD xfce4-session; then ++ if ! ck-launch-session xfce4-session; then +cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... @@ -52,7 +51,10 @@ fi - - exit 0 --fi ++else ++ # start xfce4-session normally ++ xfce4-session + fi - -## -# IMPORTANT NOTE # @@ -106,10 +108,7 @@ - $cmd & -fi - done -+else -+ # start xfce4-session normally -+ $SYSTEMD_INHIBIT_CMD xfce4-session - fi +-fi - -xfdesktop& -orage & @@ -158,14 +157,13 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" -@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then -+test -x /usr/bin/systemd-inhibit && SYSTEMD_INHIBIT_CMD="systemd-inhibit --what=idle:handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch " - +- - # 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 @@ -186,7 +184,7 @@ +# 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 ! ck-launch-session $SYSTEMD_INHIBIT_CMD xfce4-session; then ++ if ! ck-launch-session xfce4-session; then +cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... @@ -195,7 +193,10 @@ fi - - exit 0 --fi ++else ++ # start xfce4-session normally ++ xfce4-session + fi - -## -# IMPORTANT NOTE # @@ -249,10 +250,7 @@ - $cmd & -fi - done -+else -+ # start xfce4-session normally -+ $SYSTEMD_INHIBIT_CMD xfce4-session - fi +-fi - -xfdesktop& -orage & -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2013-01-29 14:49:04 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-09-29 15:37:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2013-01-29 14:49:06.0 +0100 @@ -1,0 +2,11 @@ +Tue Dec 18 10:50:34 UTC 2012 - g...@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 + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WxFd5n/_old 2013-01-29 14:49:09.0 +0100 +++ /var/tmp/diff_new_pack.WxFd5n/_new 2013-01-29 14:49:09.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.10/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch -# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch g...@opensuse.org -- Adapt upstream sessions script to openSUSE +# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-handle-multiple-interactive-session-save.patch bxo#5379 g...@opensuse.org -- Handle multiple interactive session save correctly (backported from upstream git) Patch2: xfce4-session-handle-multiple-interactive-session-save.patch ++ xfce4-session-adapt-session-scripts.patch ++ --- /var/tmp/diff_new_pack.WxFd5n/_old 2013-01-29 14:49:09.0 +0100 +++ /var/tmp/diff_new_pack.WxFd5n/_new 2013-01-29 14:49:09.0 +0100 @@ -15,13 +15,14 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then -- ++test -x /usr/bin/systemd-inhibit && SYSTEMD_INHIBIT_CMD="systemd-inhibit --what=idle:handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch " + - # 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 @@ -42,7 +43,7 @@ +# 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 ! ck-launch-session xfce4-session; then ++ if ! ck-launch-session $SYSTEMD_INHIBIT_CMD xfce4-session; then +cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... @@ -51,10 +52,7 @@ fi - - exit 0 -+else -+ # start xfce4-session normally -+ xfce4-session - fi +-fi - -## -# IMPORTANT NOTE # @@ -108,7 +106,10 @@ - $cmd & -fi - done --fi ++else ++ # start xfce4-session normally ++ $SYSTEMD_INHIBIT_CMD xfce4-session + fi - -xfdesktop& -orage & @@ -157,13 +158,14 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" -@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocp
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-09-29 15:37:55 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-09-01 22:39:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-09-29 15:37:56.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 28 13:25:45 UTC 2012 - g...@opensuse.org + +- explicitly depend on ConsoleKit-x11 which is used via DBus + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.kl42PS/_old 2012-09-29 15:37:58.0 +0200 +++ /var/tmp/diff_new_pack.kl42PS/_new 2012-09-29 15:37:58.0 +0200 @@ -58,6 +58,7 @@ Provides: xfce4-session-doc = %{version} Obsoletes: xfce4-session-doc <= 4.8.3 Requires: %{name}-branding = %{version} +Requires: ConsoleKit-x11 Requires: xfce4-settings Requires: xfconf Recommends: %{name}-doc = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-09-01 22:39:32 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-06-10 21:52:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-09-01 22:39:34.0 +0200 @@ -1,0 +2,14 @@ +Fri Aug 31 22:44:55 UTC 2012 - g...@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 - g...@opensuse.org + +- add build dependency on libICE and iceauth in order to fix the + build on Factory + +--- New: xfce4-session-handle-multiple-interactive-session-save.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.LOmbzv/_old 2012-09-01 22:39:35.0 +0200 +++ /var/tmp/diff_new_pack.LOmbzv/_new 2012-09-01 22:39:35.0 +0200 @@ -30,6 +30,11 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch g...@opensuse.org -- Adapt upstream sessions script to openSUSE Patch1: xfce4-session-adapt-session-scripts.patch +# PATCH-FIX-UPSTREAM xfce4-session-handle-multiple-interactive-session-save.patch bxo#5379 g...@opensuse.org -- Handle multiple interactive session save correctly (backported from upstream git) +Patch2: xfce4-session-handle-multiple-interactive-session-save.patch +%if 0%{?suse_version} > 1210 +BuildRequires: iceauth +%endif BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xorg-x11 @@ -38,6 +43,7 @@ BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) @@ -104,6 +110,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ ++ xfce4-session-handle-multiple-interactive-session-save.patch ++ >From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Thu, 30 Aug 2012 20:52:14 + Subject: Handle multiple interactive session save (bug #5379). Additionnaly, we now use SmSaveGlobal on log out / shutdown without session save which avoids data loss. Previously clients would not save anything on log out without session save. Based on original work by Chris Bainbridge (chris.bainbri...@gmail.com). --- diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c index bf6a446..35811c5 100644 --- a/xfce4-session/xfsm-manager.c +++ b/xfce4-session/xfsm-manager.c @@ -98,6 +98,7 @@ struct _XfsmManager XfsmShutdownType shutdown_type; XfsmShutdown *shutdown_helper; + gboolean save_session; gboolean session_chooser; gchar *session_name; @@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager) manager->failsafe_mode = TRUE; manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; manager->shutdown_helper = xfsm_shutdown_get (); + manager->save_session = TRUE; manager->pending_properties = g_queue_new (); manager->starting_properties = g_queue_new (); @@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager, XfsmClient *cl = lp->data; if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) { - xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); + /* a client is already interacting, so new client has to wait */ + xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); + xfsm_manager_cancel_client_save_timeout(manager, client); return; } } @@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, } } - if (!shutdown || shutdown_save) + /* don't save the session if shutting down without save */ + manager->save_session = !shutdown || shutdown_save; + + if (save_type == SmSaveBoth && !manager->save_session) { - xfsm_manager_set_state (manager, - shutdown - ? XF
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-06-10 20:20:37 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-05-08 11:49:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-06-10 21:52:47.0 +0200 @@ -1,0 +2,11 @@ +Wed May 16 10:07:49 UTC 2012 - g...@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 + +--- Old: xfce4-session-adapt-session-script.patch New: xfce4-session-adapt-session-scripts.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.4IOx38/_old 2012-06-10 21:52:48.0 +0200 +++ /var/tmp/diff_new_pack.4IOx38/_new 2012-06-10 21:52:48.0 +0200 @@ -28,8 +28,8 @@ Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.10/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch -# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-script.patch g...@opensuse.org -- Adapt upstream sessions script to openSUSE -Patch1: xfce4-session-adapt-session-script.patch +# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch g...@opensuse.org -- Adapt upstream sessions script to openSUSE +Patch1: xfce4-session-adapt-session-scripts.patch BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xorg-x11 @@ -118,6 +118,8 @@ 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 @@ -156,6 +158,7 @@ %{_bindir}/xflock4 %{_bindir}/startxfce4 %{_libdir}/xfce4 +%{_datadir}/xfce %{_datadir}/xsessions/xfce.desktop %{_datadir}/themes/* %{_datadir}/applications/*.desktop ++ xfce4-session-adapt-session-scripts.patch ++ Index: xfce4-session-4.10.0/scripts/xinitrc.in === --- xfce4-session-4.10.0.orig/scripts/xinitrc.in +++ xfce4-session-4.10.0/scripts/xinitrc.in @@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" -# set up XDG user directores. see -# http://freedesktop.org/wiki/Software/xdg-user-dirs -if which xdg-user-dirs-update >/dev/null 2>&1; then -xdg-user-dirs-update -fi - # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" @@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then - - # 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 which ck-launch-session >/dev/null 2>&1; then - 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 - - exit 1 -fi - else -# start xfce4-session normally -xfce4-session +# 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 ! ck-launch-session xfce4-session; then +cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... +EOF +exit 1 fi - - exit 0 +else + # start xfce4-session normally + xfce4-session fi - -## -# IMPORTANT NOTE # -## - -# Everyth
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-05-08 11:49:42 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-04-20 15:21:55.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-05-08 11:49:54.0 +0200 @@ -1,0 +2,24 @@ +Sun Apr 29 08:53:51 UTC 2012 - g...@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 - g...@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 - g...@opensuse.org + +- obsolete all xfce-utils subpackages packages properly +- obsolete xfce4-session-doc as well + +--- @@ -9,0 +34,62 @@ + +--- +Sat Apr 14 16:22:29 UTC 2012 - g...@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 - g...@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 - g...@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 Old: xfce4-session-4.8.3.tar.bz2 xfce4-session-fix-gnome-mode.patch xfce4-session-lock-screen-on-suspend-hibernate.patch xfce4-session-respect-session-save-setting.patch New: xfce4-session-4.10.0.tar.bz2 xfce4-session-adapt-session-script.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.ZqhEdJ/_old 2012-05-08 11:49:56.0 +0200 +++ /var/tmp/diff_new_pack.ZqhEdJ/_new 2012-05-08 11:49:56.0 +0200 @@ -19,28 +19,22 @@ %define libname libxfsm-4_6-0 Name: xfce4-session -Version:4.8.3 +Version:4.10.0 Release:0 Summary:Xfce Session Manager License:GPL-2.0 Group: System/GUI/XFCE Url:http://docs.xfce.org/xfce/xfce4-session
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-04-20 15:21:10 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-02-21 12:27:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-04-20 15:21:55.0 +0200 @@ -1,0 +2,20 @@ +Thu Apr 19 12:59:20 UTC 2012 - g...@opensuse.org + +- change license to GPL-2.0 (bnc#758033) + +--- +Thu Apr 19 08:43:03 UTC 2012 - g...@opensuse.org + +- let -devel depend on libxfsm-4_6-0 rather than the main package + +--- +Fri Mar 30 14:03:39 UTC 2012 - g...@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) + +--- New: xfce4-session-respect-session-save-setting.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.vYM538/_old 2012-04-20 15:21:56.0 +0200 +++ /var/tmp/diff_new_pack.vYM538/_new 2012-04-20 15:21:56.0 +0200 @@ -16,65 +16,79 @@ # +%define libname libxfsm-4_6-0 + Name: xfce4-session Version:4.8.3 Release:0 Summary:Xfce Session Manager -License:GPL-2.0+ +License:GPL-2.0 Group: System/GUI/XFCE -Url:http://www.xfce.org/projects/xfce4-session/ -Source: %{name}-%{version}.tar.bz2 +Url:http://docs.xfce.org/xfce/xfce4-session/start +Source: http://archive.xfce.org/src/xfce/xfce4-session/4.8/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-UPSTREAM xfce4-session-fix-gnome-mode.patch bnc#710038 bxo#8014 g...@opensuse.org -- Removes obsolete GNOME compatibility code, treats GNOME-/KDE-only autostart files as inactive, and allows to enable them through xfce4-session-settings Patch1: xfce4-session-fix-gnome-mode.patch # PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 g...@opensuse.org -- Try to lock the screen when hibernating/suspending Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch -BuildRequires: docbook-xsl-stylesheets -BuildRequires: docbook_4 +# PATCH-FIX-UPSTREAM xfce4-session-respect-session-save-setting.patch bxo#7915 g...@opensuse.org -- Respect the value of the "/general/SaveOnExit" option from xfce4-session in the logout panel plugin as well (backported from upstream git) +Patch3: xfce4-session-respect-session-save-setting.patch BuildRequires: intltool -BuildRequires: libxslt -BuildRequires: perl-XML-Parser BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools -BuildRequires: xml2po BuildRequires: xorg-x11 +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: pkgconfig(libxfcegui4-1.0) -BuildRequires: pkgconfig(libxfconf-0) BuildRequires: pkgconfig(sm) -Requires: %{name}-branding >= %{version} +Requires: %{name}-branding = %{version} Requires: xfce-utils +Requires: xfce4-settings +Requires: xfconf +Recommends: %{name}-doc = %{version} +Recommends: %{name}-lang = %{version} +# for xfce4-tips Recommends: fortune BuildRoot: %{_tmppath}/%{name}-%{version}-build %description xfce4-session is the session manager for the Xfce desktop environment. +%package -n %{libname} +Summary:Shared Library for xfce4-session Splash Screen Engines +Group: System/Libraries + +%description -n %{libname} +This package contains the shared library for xfce4-session splash screen +engines. + %packagedevel -Summary:Deve
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-02-21 12:27:08 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-02-16 10:11:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-02-21 12:27:10.0 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 13:20:27 UTC 2012 - g...@opensuse.org + +- added missing build dependency on libSM-devel + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.b5okLn/_old 2012-02-21 12:27:11.0 +0100 +++ /var/tmp/diff_new_pack.b5okLn/_new 2012-02-21 12:27:11.0 +0100 @@ -48,6 +48,7 @@ BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: pkgconfig(libxfconf-0) +BuildRequires: pkgconfig(sm) Requires: %{name}-branding >= %{version} Requires: xfce-utils Recommends: fortune -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-02-16 10:11:02 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2012-01-19 16:58:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-02-16 10:11:08.0 +0100 @@ -1,0 +2,8 @@ +Sun Feb 12 20:27:03 UTC 2012 - g...@opensuse.org + +- update to version 4.8.3 + - link to gmodule + - translation updates +- dropped obsolete xfce4-session-fix-libgmodule-underlinking.patch + +--- Old: xfce4-session-4.8.2.tar.bz2 xfce4-session-fix-libgmodule-underlinking.patch New: xfce4-session-4.8.3.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.wn2n4o/_old 2012-02-16 10:11:10.0 +0100 +++ /var/tmp/diff_new_pack.wn2n4o/_new 2012-02-16 10:11:10.0 +0100 @@ -17,7 +17,7 @@ Name: xfce4-session -Version:4.8.2 +Version:4.8.3 Release:0 Summary:Xfce Session Manager License:GPL-2.0+ @@ -30,8 +30,6 @@ Patch1: xfce4-session-fix-gnome-mode.patch # PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 g...@opensuse.org -- Try to lock the screen when hibernating/suspending Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch -# PATCH-FEATURE-UPSTREAM xfce4-session-fix-libgmodule-underlinking.patch bxo#8340 g...@opensuse.org -- Link explicitly against libgmodule -Patch3: xfce4-session-fix-libgmodule-underlinking.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 BuildRequires: intltool @@ -94,7 +92,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build xdt-autogen @@ -122,17 +119,13 @@ %post %run_suseconfig -m gtk2 /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %desktop_database_post %icon_theme_cache_post -%endif %postun /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %desktop_database_postun %icon_theme_cache_postun -%endif %files -f %{name}.lang %defattr(-,root,root) ++ xfce4-session-4.8.2.tar.bz2 -> xfce4-session-4.8.3.tar.bz2 ++ 18574 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2012-01-19 16:57:20 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2011-12-21 10:04:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2012-01-19 16:58:08.0 +0100 @@ -1,0 +2,6 @@ +Fri Jan 13 17:04:56 UTC 2012 - g...@opensuse.org + +- added xfce4-session-fix-libgmodule-underlinking.patch in order to + explicitly link against libgmodule + +--- New: xfce4-session-fix-libgmodule-underlinking.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.bCLLJN/_old 2012-01-19 16:58:09.0 +0100 +++ /var/tmp/diff_new_pack.bCLLJN/_new 2012-01-19 16:58:09.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,12 +30,15 @@ Patch1: xfce4-session-fix-gnome-mode.patch # PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 g...@opensuse.org -- Try to lock the screen when hibernating/suspending Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch +# PATCH-FEATURE-UPSTREAM xfce4-session-fix-libgmodule-underlinking.patch bxo#8340 g...@opensuse.org -- Link explicitly against libgmodule +Patch3: xfce4-session-fix-libgmodule-underlinking.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 BuildRequires: intltool BuildRequires: libxslt BuildRequires: perl-XML-Parser BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: xml2po BuildRequires: xorg-x11 BuildRequires: pkgconfig(dbus-glib-1) @@ -91,8 +94,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build +xdt-autogen %configure \ --docdir=%{_datadir}/xfce4/xfce4-session \ --disable-static \ ++ xfce4-session-fix-libgmodule-underlinking.patch ++ Index: xfce4-session-4.8.2/configure.in === --- xfce4-session-4.8.2.orig/configure.in +++ xfce4-session-4.8.2/configure.in @@ -82,6 +82,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2. XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22]) XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73]) +XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], []) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) dnl we provide a panel plugin now Index: xfce4-session-4.8.2/settings/Makefile.am === --- xfce4-session-4.8.2.orig/settings/Makefile.am +++ xfce4-session-4.8.2/settings/Makefile.am @@ -25,6 +25,7 @@ xfce4_session_settings_CFLAGS = \ -DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \ -DG_LOG_DOMAIN=\"xfce4-session-settings\" \ -I$(top_srcdir) \ + $(GMODULE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(XFCONF_CFLAGS) \ @@ -32,7 +33,8 @@ xfce4_session_settings_CFLAGS = \ xfce4_session_settings_LDADD = \ $(top_builddir)/libxfsm/libxfsm-4.6.la \ - $(LIBXFCE4UTIL_CFLAGS) \ + $(GMODULE_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ $(XFCONF_LIBS) \ $(DBUS_GLIB_LIBS) Index: xfce4-session-4.8.2/xfce4-session/Makefile.am === --- xfce4-session-4.8.2.orig/xfce4-session/Makefile.am +++ xfce4-session-4.8.2/xfce4-session/Makefile.am @@ -51,6 +51,7 @@ xfce4_session_SOURCES = \ xfsm-startup.h xfce4_session_CFLAGS = \ + $(GMODULE_CFLAGS) \ $(GNOME_CFLAGS) \ $(GNOME_KEYRING_CFLAGS) \ $(LIBSM_CFLAGS) \ @@ -69,6 +70,7 @@ xfce4_session_CFLAGS = \ xfce4_session_LDADD = \ $(
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2011-12-21 10:04:28 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2011-12-15 16:08:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2011-12-21 10:04:30.0 +0100 @@ -1,0 +2,7 @@ +Thu Dec 15 15:58:02 UTC 2011 - g...@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 + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.ss8YWt/_old 2011-12-21 10:04:31.0 +0100 +++ /var/tmp/diff_new_pack.ss8YWt/_new 2011-12-21 10:04:31.0 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xfce4-session Version:4.8.2 Release:0 ++ xfce4-session-lock-screen-on-suspend-hibernate.patch ++ --- /var/tmp/diff_new_pack.ss8YWt/_old 2011-12-21 10:04:31.0 +0100 +++ /var/tmp/diff_new_pack.ss8YWt/_new 2011-12-21 10:04:31.0 +0100 @@ -2,30 +2,54 @@ === --- xfce4-session-4.8.2.orig/xfce4-session/xfsm-shutdown-helper.c +++ xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c -@@ -1783,8 +1783,13 @@ gboolean xfsm_shutdown_helper_restart (X - **/ - gboolean xfsm_shutdown_helper_suspend (XfsmShutdownHelper *helper, GError **error) - { +@@ -71,6 +71,8 @@ + + #include + ++#include ++ + #include "xfsm-shutdown-helper.h" + #include "xfsm-global.h" + +@@ -1722,6 +1724,24 @@ gboolean xfsm_shutdown_helper_send_passw + return TRUE; + } + ++static void ++lock_screen (void) ++{ ++ XfconfChannel *channel; + gboolean ret; ++ gint exit_status; ++ ++ channel = xfconf_channel_get ("xfce4-power-manager"); ++ if (xfconf_channel_get_bool (channel, "/xfce4-power-manager/lock-screen-suspend-hibernate", TRUE)) ++{ ++ ret = g_spawn_command_line_sync ("xflock4", NULL, NULL, &exit_status, NULL); ++ if (!ret || exit_status != 0) ++{ ++ g_warning ("Could not lock screen"); ++} ++} ++} ++ + /** + * xfsm_shutdown_helper_shutdown: + * +@@ -1785,6 +1805,8 @@ gboolean xfsm_shutdown_helper_suspend (X + { g_return_val_if_fail (!error || !*error, FALSE); -+ ret = g_spawn_command_line_async ("xflock4", NULL); -+ if (!ret) -+ g_warning("Could not lock screen"); ++ lock_screen (); + #ifdef ENABLE_UPOWER if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) { -@@ -1810,8 +1815,13 @@ gboolean xfsm_shutdown_helper_suspend (X - **/ - gboolean xfsm_shutdown_helper_hibernate (XfsmShutdownHelper *helper, GError **error) +@@ -1812,6 +1834,8 @@ gboolean xfsm_shutdown_helper_hibernate { -+ gboolean ret; g_return_val_if_fail (!error || !*error, FALSE); -+ ret = g_spawn_command_line_async ("xflock4", NULL); -+ if (!ret) -+ g_warning("Could not lock screen"); ++ lock_screen (); + #ifdef ENABLE_UPOWER if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2011-12-15 16:08:08 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2011-11-14 13:48:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2011-12-15 16:08:10.0 +0100 @@ -1,0 +2,7 @@ +Wed Dec 14 13:18:26 UTC 2011 - g...@opensuse.org + +- added xfce4-session-lock-screen-on-suspend-hibernate.patch in + order to try to locking the screen when hibernating/suspending + (bxo#6019) + +--- New: xfce4-session-lock-screen-on-suspend-hibernate.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.pSJ1Xe/_old 2011-12-15 16:08:11.0 +0100 +++ /var/tmp/diff_new_pack.pSJ1Xe/_new 2011-12-15 16:08:11.0 +0100 @@ -15,37 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: xfce4-session Version:4.8.2 -Release:13 +Release:0 +Summary:Xfce Session Manager License:GPL-2.0+ -Summary:Xfce Session manager -Url:http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE +Url:http://www.xfce.org/projects/xfce4-session/ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-UPSTREAM xfce4-session-fix-gnome-mode.patch bnc#710038 bxo#8014 g...@opensuse.org -- Removes obsolete GNOME compatibility code, treats GNOME-/KDE-only autostart files as inactive, and allows to enable them through xfce4-session-settings Patch1: xfce4-session-fix-gnome-mode.patch +# PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 g...@opensuse.org -- Try to lock the screen when hibernating/suspending +Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook_4 BuildRequires: intltool +BuildRequires: libxslt BuildRequires: perl-XML-Parser +BuildRequires: update-desktop-files +BuildRequires: xml2po +BuildRequires: xorg-x11 BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: pkgconfig(libxfconf-0) -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: update-desktop-files -BuildRequires: xorg-x11 -BuildRequires: libxslt -BuildRequires: xml2po -BuildRequires: docbook_4 -BuildRequires: docbook-xsl-stylesheets Requires: %{name}-branding >= %{version} Requires: xfce-utils Recommends: fortune @@ -55,7 +55,6 @@ xfce4-session is the session manager for the Xfce desktop environment. %packagedevel -License:GPL-2.0+ Summary:Development files for xfce4-session Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -72,8 +71,8 @@ This package contains development files needed to develop custom splash themes. %package branding-upstream -License:GPL-2.0+ Summary:Upstream branding of xfce4-session +Group: System/GUI/XFCE Supplements:packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) @@ -90,6 +89,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ ++ xfce4-session-lock-screen-on-suspend-hibernate.patch ++ Index: xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c === --- xfce4-session-4.8.2.orig/xfce4-session/xfsm-shutdown-helper.c +++ xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c @@ -1783,8 +1783,13 @@ gboolean xfsm_shutdown_helper_restart (X **/ gboolean xfsm_shutdown_helper_suspend (XfsmShutdownHelper *helper, GError **error) { + gboolean ret; g_return_val_if_fail (!error || !*error, FALSE); + ret = g_spawn_command_
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2011-12-06 19:15:25 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.iGS5N2/_old 2011-12-06 19:55:00.0 +0100 +++ /var/tmp/diff_new_pack.iGS5N2/_new 2011-12-06 19:55:00.0 +0100 @@ -20,7 +20,7 @@ Name: xfce4-session Version:4.8.2 Release:13 -License:GPLv2+ +License:GPL-2.0+ Summary:Xfce Session manager Url:http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE @@ -55,7 +55,7 @@ xfce4-session is the session manager for the Xfce desktop environment. %packagedevel -License:GPLv2+ +License:GPL-2.0+ Summary:Development files for xfce4-session Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -72,7 +72,7 @@ This package contains development files needed to develop custom splash themes. %package branding-upstream -License:GPLv2+ +License:GPL-2.0+ Summary:Upstream branding of xfce4-session Supplements:packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2011-11-14 13:48:02 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2011-10-28 15:29:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2011-11-14 13:48:07.0 +0100 @@ -1,0 +2,6 @@ +Sun Nov 13 17:33:24 UTC 2011 - g...@opensuse.org + +- fixed xfce4-session-fix-gnome-mode.patch to prevent NULL pointer + dereference on invalid autostart files (bnc#730059) + +--- Other differences: -- ++ xfce4-session-fix-gnome-mode.patch ++ --- /var/tmp/diff_new_pack.b7tM3m/_old 2011-11-14 13:48:08.0 +0100 +++ /var/tmp/diff_new_pack.b7tM3m/_new 2011-11-14 13:48:08.0 +0100 @@ -1,6 +1,6 @@ diff -urNp xfce4-session-4.8.2.orig/settings/xfae-model.c xfce4-session-4.8.2/settings/xfae-model.c --- xfce4-session-4.8.2.orig/settings/xfae-model.c 2011-09-13 18:17:10.0 +0200 -+++ xfce4-session-4.8.2/settings/xfae-model.c 2011-10-08 17:37:29.0 +0200 xfce4-session-4.8.2/settings/xfae-model.c 2011-11-13 17:45:34.0 +0100 @@ -73,6 +73,7 @@ static gboolean xfae_model_ite static XfaeItem *xfae_item_new (const gchar *relpath); static void xfae_item_free (XfaeItem *item); @@ -34,32 +34,69 @@ gchar **not_show_in; gchar **args; gchar *icon_name; -@@ -457,18 +458,18 @@ xfae_item_new (const gchar *relpath) - } +@@ -454,37 +455,37 @@ xfae_item_new (const gchar *relpath) + item->comment = g_strdup (value); - /* check the OnlyShowIn setting */ + item->hidden = xfce_rc_read_bool_entry (rc, "Hidden", FALSE); +-} +- +- /* check the OnlyShowIn setting */ - only_show_in = xfce_rc_read_list_entry (rc, "OnlyShowIn", ";"); - if (G_UNLIKELY (only_show_in != NULL)) -+ item->only_show_in = xfce_rc_read_list_entry (rc, "OnlyShowIn", ";"); -+ if (G_UNLIKELY (item->only_show_in != NULL)) - { +-{ - /* check if "Xfce" is specified */ - for (m = 0, skip = TRUE; only_show_in[m] != NULL; ++m) -if (g_ascii_strcasecmp (only_show_in[m], "Xfce") == 0) -+ /* check if "Xfce", "GNOME", or "KDE" are specified */ -+ for (m = 0, skip = TRUE; item->only_show_in[m] != NULL; ++m) -+if ((g_ascii_strcasecmp (item->only_show_in[m], "Xfce") == 0) || -+(g_ascii_strcasecmp (item->only_show_in[m], "GNOME") == 0) || -+(g_ascii_strcasecmp (item->only_show_in[m], "KDE") == 0)) - { - skip = FALSE; - break; - } -- +- { +-skip = FALSE; +-break; +- } + - g_strfreev (only_show_in); +-} +- else +-{ +- /* check the NotShowIn setting */ +- not_show_in = xfce_rc_read_list_entry (rc, "NotShowIn", ";"); +- if (G_UNLIKELY (not_show_in != NULL)) ++ /* check the OnlyShowIn setting */ ++ item->only_show_in = xfce_rc_read_list_entry (rc, "OnlyShowIn", ";"); ++ if (G_UNLIKELY (item->only_show_in != NULL)) + { +- /* check if "Xfce" is not specified */ +- for (m = 0; not_show_in[m] != NULL; ++m) +-if (g_ascii_strcasecmp (not_show_in[m], "Xfce") == 0) ++ /* check if "Xfce", "GNOME", or "KDE" are specified */ ++ for (m = 0, skip = TRUE; item->only_show_in[m] != NULL; ++m) ++if ((g_ascii_strcasecmp (item->only_show_in[m], "Xfce") == 0) || ++(g_ascii_strcasecmp (item->only_show_in[m], "GNOME") == 0) || ++(g_ascii_strcasecmp (item->only_show_in[m], "KDE") == 0)) + { +-skip = TRUE; ++skip = FALSE; + break; + } ++} ++ else ++{ ++ /* check the NotShowIn setting */ ++ not_show_in = xfce_rc_read_list_entry (rc, "NotShowIn", ";"); ++ if (G_UNLIKELY (not_show_in != NULL)) ++{ ++ /* check if "Xfce" is not specified */ ++ for (m = 0; not_show_in[m] != NULL; ++m) ++if (g_ascii_strcasecmp (not_show_in[m], "Xfce") == 0) ++
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2011-10-25 17:20:46 Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de" Changes: --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2011-10-19 00:56:04.0 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2011-10-28 15:29:54.0 +0200 @@ -1,0 +2,6 @@ +Fri Oct 21 11:47:24 UTC 2011 - g...@opensuse.org + +- install HTML documentation under + /usr/share/xfce4/xfce4-session/html + +--- Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WKFvLZ/_old 2011-10-28 15:30:02.0 +0200 +++ /var/tmp/diff_new_pack.WKFvLZ/_new 2011-10-28 15:30:02.0 +0200 @@ -93,7 +93,7 @@ %build %configure \ ---docdir=%{_defaultdocdir}/%{name} \ +--docdir=%{_datadir}/xfce4/xfce4-session \ --disable-static \ --enable-session-screenshots \ --enable-gnome \ @@ -106,8 +106,6 @@ %suse_update_desktop_file xfce-session-settings %suse_update_desktop_file xfce4-session-logout %suse_update_desktop_file xfce4-tips-autostart -install -p -m 644 AUTHORS BUGS COPYING ChangeLog NEWS README TODO \ -%{buildroot}/%{_defaultdocdir}/%{name} rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/session/splash-engines/*.la @@ -132,7 +130,7 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} +%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO %{_bindir}/xfce4-session %{_bindir}/xfce4-session-logout %{_bindir}/xfce4-session-settings @@ -143,7 +141,11 @@ %{_datadir}/themes/* %{_datadir}/applications/* %{_datadir}/icons/*/* -%{_datadir}/xfce4/ +%{_datadir}/xfce4/panel-plugins/xfsm-logout-plugin.desktop +%{_datadir}/xfce4/tips/ +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/xfce4-session +%doc %{_datadir}/xfce4/xfce4-session/html/ %files devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at Fri Oct 14 09:49:32 CEST 2011. --- openSUSE:Factory/xfce4-session/xfce4-session.changes2011-09-23 12:51:29.0 +0200 +++ /mounts/work_src_done/STABLE/xfce4-session/xfce4-session.changes 2011-10-13 21:50:33.0 +0200 @@ -1,0 +2,8 @@ +Sat Oct 8 16:22:18 UTC 2011 - g...@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) + +--- calling whatdependson for head-i586 New: xfce4-session-fix-gnome-mode.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.05Tgs2/_old 2011-10-14 09:49:28.0 +0200 +++ /var/tmp/diff_new_pack.05Tgs2/_new 2011-10-14 09:49:28.0 +0200 @@ -27,6 +27,8 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch +# PATCH-FIX-UPSTREAM xfce4-session-fix-gnome-mode.patch bnc#710038 bxo#8014 g...@opensuse.org -- Removes obsolete GNOME compatibility code, treats GNOME-/KDE-only autostart files as inactive, and allows to enable them through xfce4-session-settings +Patch1: xfce4-session-fix-gnome-mode.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -87,6 +89,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ ++ xfce4-session-fix-gnome-mode.patch ++ diff -urNp xfce4-session-4.8.2.orig/settings/xfae-model.c xfce4-session-4.8.2/settings/xfae-model.c --- xfce4-session-4.8.2.orig/settings/xfae-model.c 2011-09-13 18:17:10.0 +0200 +++ xfce4-session-4.8.2/settings/xfae-model.c 2011-10-08 17:37:29.0 +0200 @@ -73,6 +73,7 @@ static gboolean xfae_model_ite static XfaeItem *xfae_item_new (const gchar *relpath); static void xfae_item_free (XfaeItem *item); static gboolean xfae_item_is_removable (XfaeItem *item); +static gboolean xfae_item_is_compat (XfaeItem *item); @@ -95,6 +96,7 @@ struct _XfaeItem GdkPixbuf *icon; gchar *comment; gchar *relpath; + gchar **only_show_in; gboolean hidden; }; @@ -287,7 +289,7 @@ xfae_model_get_value (GtkTreeModel *tree case XFAE_MODEL_COLUMN_ENABLED: g_value_init (value, G_TYPE_BOOLEAN); - g_value_set_boolean (value, !item->hidden); + g_value_set_boolean (value, !(item->hidden || xfae_item_is_compat (item))); break; case XFAE_MODEL_COLUMN_REMOVABLE: @@ -401,7 +403,6 @@ xfae_item_new (const gchar *relpath) XfaeItem*item = NULL; gboolean skip = FALSE; XfceRc *rc; - gchar **only_show_in; gchar **not_show_in; gchar **args; gchar *icon_name; @@ -457,18 +458,18 @@ xfae_item_new (const gchar *relpath) } /* check the OnlyShowIn setting */ - only_show_in = xfce_rc_read_list_entry (rc, "OnlyShowIn", ";"); - if (G_UNLIKELY (only_show_in != NULL)) + item->only_show_in = xfce_rc_read_list_entry (rc, "OnlyShowIn", ";"); + if (G_UNLIKELY (item->only_show_in != NULL)) { - /* check if "Xfce" is specified */ - for (m = 0, skip = TRUE; only_show_in[m] != NULL; ++m) -if (g_ascii_strcasecmp (only_show_in[m], "Xfce") == 0) + /* check if "Xfce", "GNOME", or "KDE" are specified */ + for (m = 0, skip = TRUE; item->only_show_in[m] != NULL; ++m) +if ((g_ascii_strcasecmp (item->only_show_in[m], "Xfce") == 0) || +(g_ascii_strcasecmp (item->only_show_in[m], "GNOME") == 0) || +(g_ascii_strcasecmp (item->only_show_in[m], "KDE") == 0)) { skip = FALSE; break; } - - g_strfreev (only_show_in); } else { @@ -515,6 +516,7 @@ xfae_item_free (XfaeItem *item) g_free (item->relpath); g_free (item->comment); g_free (item->name); + g_strfreev (item->only_show_in); g_free (item); } @@ -545,6 +547,32 @@ xfae_item_is_removable (XfaeItem *item) static gboolean +xfae_item_is_compat (XfaeItem *item) +{ + gint m; + gboolean is_compat = FALSE; + + if (item->only_show_in != NULL) +{ + for (m = 0; item->only_show_in[m] != NULL; ++m) +{ + if (g_ascii_strcasecmp (item->only_show_in[m], "Xf
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at Wed Sep 21 17:29:12 CEST 2011. --- xfce4-session/xfce4-session.changes 2011-07-26 09:42:34.0 +0200 +++ /mounts/work_src_done/STABLE/xfce4-session/xfce4-session.changes 2011-09-19 15:45:36.0 +0200 @@ -1,0 +2,17 @@ +Mon Sep 19 13:38:57 UTC 2011 - g...@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 + +--- calling whatdependson for head-i586 Old: xfce4-session-4.8.1-disable-hostname-check.patch xfce4-session-4.8.1-fix-gdm_lang-usage.patch xfce4-session-4.8.1.tar.bz2 New: xfce4-session-4.8.2.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WEPSEl/_old 2011-09-21 17:29:07.0 +0200 +++ /var/tmp/diff_new_pack.WEPSEl/_new 2011-09-21 17:29:07.0 +0200 @@ -18,7 +18,7 @@ Name: xfce4-session -Version:4.8.1 +Version:4.8.2 Release:13 License:GPLv2+ Summary:Xfce Session manager @@ -27,10 +27,6 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 g...@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git) -Patch1: xfce4-session-4.8.1-fix-gdm_lang-usage.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-disable-hostname-check.patch g...@opensuse.org -- Only perform hostname checks when TCP connections are enabled (backported from upstream git) -Patch2: xfce4-session-4.8.1-disable-hostname-check.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -91,8 +87,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure \ ++ xfce4-session-4.8.1.tar.bz2 -> xfce4-session-4.8.2.tar.bz2 ++ 90300 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at Tue Jul 26 17:03:41 CEST 2011. --- xfce4-session/xfce4-session.changes 2011-05-17 11:04:40.0 +0200 +++ /mounts/work_src_done/STABLE/xfce4-session/xfce4-session.changes 2011-07-26 09:42:34.0 +0200 @@ -1,0 +2,7 @@ +Tue Jul 26 07:19:25 UTC 2011 - g...@opensuse.org + +- added xfce4-session-4.8.1-disable-hostname-check.patch so + hostname checks are only performed when TCP connections are + enabled + +--- calling whatdependson for head-i586 New: xfce4-session-4.8.1-disable-hostname-check.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.Wb3exC/_old 2011-07-26 17:03:23.0 +0200 +++ /var/tmp/diff_new_pack.Wb3exC/_new 2011-07-26 17:03:23.0 +0200 @@ -19,16 +19,18 @@ Name: xfce4-session Version:4.8.1 -Release:11 +Release:13 License:GPLv2+ Summary:Xfce Session manager Url:http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows -Patch1: xfce4-session-simple-splash-remove-shadows.patch +Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 g...@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git) -Patch2: xfce4-session-4.8.1-fix-gdm_lang-usage.patch +Patch1: xfce4-session-4.8.1-fix-gdm_lang-usage.patch +# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-disable-hostname-check.patch g...@opensuse.org -- Only perform hostname checks when TCP connections are enabled (backported from upstream git) +Patch2: xfce4-session-4.8.1-disable-hostname-check.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -88,6 +90,7 @@ %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 ++ xfce4-session-4.8.1-disable-hostname-check.patch ++ commit ba231e2eee82c321f473687e425d455fb36205d9 Author: Benedikt Meurer Date: Tue Jul 26 08:19:09 2011 +0200 Only perform hostname checks when TCP connections are enabled. Based on a patch from Guido Berhoerster . xfce4-session/main.c |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xfce4-session/main.c b/xfce4-session/main.c index 0466f48..8f7c003 100644 --- a/xfce4-session/main.c +++ b/xfce4-session/main.c @@ -247,9 +247,12 @@ main (int argc, char **argv) dpy = gdk_display_get_default (); init_display (manager, dpy, channel, opt_disable_tcp); - /* verify that the DNS settings are ok */ - xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings")); - xfsm_dns_check (); + if (!opt_disable_tcp && xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE)) +{ + /* verify that the DNS settings are ok */ + xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings")); + xfsm_dns_check (); +} xfsm_splash_screen_next (splash_screen, _("Loading session data")); Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at Tue May 31 14:46:33 CEST 2011. --- xfce4-session/xfce4-session.changes 2011-04-01 21:39:08.0 +0200 +++ /mounts/work_src_done/STABLE/xfce4-session/xfce4-session.changes 2011-05-17 11:04:40.0 +0200 @@ -1,0 +2,6 @@ +Tue May 17 09:03:24 UTC 2011 - g...@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) + +--- calling whatdependson for head-i586 New: xfce4-session-4.8.1-fix-gdm_lang-usage.patch Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.e1UjVU/_old 2011-05-31 14:46:12.0 +0200 +++ /var/tmp/diff_new_pack.e1UjVU/_new 2011-05-31 14:46:12.0 +0200 @@ -19,7 +19,7 @@ Name: xfce4-session Version:4.8.1 -Release:1 +Release:11 License:GPLv2+ Summary:Xfce Session manager Url:http://www.xfce.org/projects/xfce4-session/ @@ -27,6 +27,8 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch1: xfce4-session-simple-splash-remove-shadows.patch +# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 g...@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git) +Patch2: xfce4-session-4.8.1-fix-gdm_lang-usage.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -87,6 +89,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure \ ++ xfce4-session-4.8.1-fix-gdm_lang-usage.patch ++ diff --git a/xfce4-session/main.c b/xfce4-session/main.c index ff6e324..fcf69f8 100644 --- a/xfce4-session/main.c +++ b/xfce4-session/main.c @@ -103,7 +103,7 @@ setup_environment (void) /* this is for compatibility with the GNOME Display Manager */ lang = g_getenv ("GDM_LANG"); - if (lang != NULL) + if (lang != NULL && strlen (lang) > 0) { xfce_setenv ("LANG", lang, TRUE); xfce_unsetenv ("GDM_LANG"); Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xfce4-session for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at Mon May 2 17:29:11 CEST 2011. --- xfce4-session/xfce4-session.changes 2011-02-18 01:22:14.0 +0100 +++ xfce4-session/xfce4-session.changes 2011-04-01 21:39:08.0 +0200 @@ -1,0 +2,13 @@ +Fri Apr 1 19:20:50 UTC 2011 - g...@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 + +--- calling whatdependson for head-i586 Old: xfce4-session-4.7.1-fix-missing-include.patch 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 xfce4-session-4.8.0.tar.bz2 New: xfce4-session-4.8.1.tar.bz2 Other differences: -- ++ xfce4-session.spec ++ --- /var/tmp/diff_new_pack.WLtQba/_old 2011-05-02 17:28:24.0 +0200 +++ /var/tmp/diff_new_pack.WLtQba/_new 2011-05-02 17:28:24.0 +0200 @@ -18,22 +18,15 @@ Name: xfce4-session -Version:4.8.0 -Release:9 +Version:4.8.1 +Release:1 License:GPLv2+ Summary:Xfce Session manager Url:http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE Source: %{name}-%{version}.tar.bz2 -Patch0: xfce4-session-4.7.1-fix-missing-include.patch # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch g...@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch1: xfce4-session-simple-splash-remove-shadows.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-fast-cli-option.patch g...@opensuse.org -- Fixes the use of the --fast cli option with other options (backported from upstream git) -Patch2: xfce4-session-4.8.0-fix-fast-cli-option.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch g...@opensuse.org -- Fixes the error popup when clicking a session menu item (backported from upstream git) -Patch3: xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch g...@opensuse.org -- Prevents the logout dialog from falling back to system-* rather than xfsm-* icons (backported from upstream git) -Patch4: xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -93,11 +86,7 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %configure \ ++ xfce4-session-4.8.0.tar.bz2 -> xfce4-session-4.8.1.tar.bz2 ++ 24861 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org