pool/xfce4-session
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 289361 from X11:xfce

Browse Source 
Xfce 4.12

OBS-URL: https://build.opensuse.org/request/show/289361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2015-03-09 09:05:20 +00:00 committed by Git OBS Bridge
commit 7a769ba508
8 changed files with 98 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xfce4-session-4.10.1-fix-bashisms.patch
View File

@ -1,37 +0,0 @@
From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koegel@gmail.com>
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

3
xfce4-session-4.10.1.tar.bz2
View File

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

3
xfce4-session-4.12.0.tar.bz2 Normal file
View File

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

34
xfce4-session-adapt-session-scripts.patch
View File

@ -1,7 +1,7 @@
Index: xfce4-session-4.10.1/scripts/xinitrc.in Index: xfce4-session-4.12.0/scripts/xinitrc.in
=================================================================== ===================================================================
--- xfce4-session-4.10.1.orig/scripts/xinitrc.in --- xfce4-session-4.12.0.orig/scripts/xinitrc.in
+++ xfce4-session-4.10.1/scripts/xinitrc.in +++ xfce4-session-4.12.0/scripts/xinitrc.in
@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then
export XDG_MENU_PREFIX export XDG_MENU_PREFIX
fi fi
@ -18,9 +18,9 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in
+ export XDG_CURRENT_DESKTOP + export XDG_CURRENT_DESKTOP
+fi +fi
# $XDG_CONFIG_HOME defines the base directory relative to which user specific # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme
# configuration files should be stored. If $XDG_CONFIG_HOME is either not set if test "x$XDG_CURRENT_DESKTOP" = "x"; then
@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then @@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
@ -33,7 +33,7 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in
# Modify libglade and glade environment variables so that # Modify libglade and glade environment variables so that
# it will find the files installed by Xfce # it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs"
@@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp @@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap # load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
@ -158,10 +158,10 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in
-esac -esac
- -
-xsetroot -bg white -fg red -solid black -cursor_name watch -xsetroot -bg white -fg red -solid black -cursor_name watch
Index: xfce4-session-4.10.1/scripts/xinitrc.in.in Index: xfce4-session-4.12.0/scripts/xinitrc.in.in
=================================================================== ===================================================================
--- xfce4-session-4.10.1.orig/scripts/xinitrc.in.in --- xfce4-session-4.12.0.orig/scripts/xinitrc.in.in
+++ xfce4-session-4.10.1/scripts/xinitrc.in.in +++ xfce4-session-4.12.0/scripts/xinitrc.in.in
@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then
export XDG_MENU_PREFIX export XDG_MENU_PREFIX
fi fi
@ -178,9 +178,9 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in.in
+ export XDG_CURRENT_DESKTOP + export XDG_CURRENT_DESKTOP
+fi +fi
# $XDG_CONFIG_HOME defines the base directory relative to which user specific # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme
# configuration files should be stored. If $XDG_CONFIG_HOME is either not set if test "x$XDG_CURRENT_DESKTOP" = "x"; then
@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then @@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
@ -193,7 +193,7 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in.in
# Modify libglade and glade environment variables so that # Modify libglade and glade environment variables so that
# it will find the files installed by Xfce # it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@"
@@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp @@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap # load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
@ -318,10 +318,10 @@ Index: xfce4-session-4.10.1/scripts/xinitrc.in.in
-esac -esac
- -
-xsetroot -bg white -fg red -solid black -cursor_name watch -xsetroot -bg white -fg red -solid black -cursor_name watch
Index: xfce4-session-4.10.1/scripts/startxfce4.in Index: xfce4-session-4.12.0/scripts/startxfce4.in
=================================================================== ===================================================================
--- xfce4-session-4.10.1.orig/scripts/startxfce4.in --- xfce4-session-4.12.0.orig/scripts/startxfce4.in
+++ xfce4-session-4.10.1/scripts/startxfce4.in +++ xfce4-session-4.12.0/scripts/startxfce4.in
@@ -66,13 +66,22 @@ fi @@ -66,13 +66,22 @@ fi
if test "x$XDG_DATA_DIRS" = "x" if test "x$XDG_DATA_DIRS" = "x"

9
xfce4-session-set-desktop-name.patch
View File

@ -1,9 +0,0 @@
Index: xfce4-session-4.10.1/xfce.desktop.in
===================================================================
--- xfce4-session-4.10.1.orig/xfce.desktop.in
+++ xfce4-session-4.10.1/xfce.desktop.in
@@ -5,3 +5,4 @@ _Comment=Use this session to run Xfce as
Exec=startxfce4
Icon=
Type=Application
+DesktopNames=XFCE

390
xfce4-session-systemd-suspend-hibernate-support.patch
View File

@ -1,390 +0,0 @@
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
xfce4_session_CFLAGS = \
Index: xfce4-session-4.10.1/xfce4-session/xfsm-systemd.c
===================================================================
--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-systemd.c
+++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.c
@@ -24,6 +24,7 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
+#include <libxfsm/xfsm-util.h>
#include <xfce4-session/xfsm-systemd.h>
@@ -33,8 +34,12 @@
#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
#define SYSTEMD_REBOOT_ACTION "Reboot"
#define SYSTEMD_POWEROFF_ACTION "PowerOff"
+#define SYSTEMD_SUSPEND_ACTION "Suspend"
+#define SYSTEMD_HIBERNATE_ACTION "Hibernate"
#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
+#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
+#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
@@ -93,6 +98,22 @@ xfsm_systemd_finalize (GObject *object)
}
+
+static gboolean
+xfsm_systemd_lock_screen (GError **error)
+{
+ XfconfChannel *channel;
+ gboolean ret = TRUE;
+
+ channel = xfsm_open_config ();
+ if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE))
+ ret = g_spawn_command_line_async ("xflock4", error);
+
+ return ret;
+}
+
+
+
static gboolean
xfsm_systemd_can_method (XfsmSystemd *systemd,
gboolean *can_method,
@@ -205,6 +226,34 @@ xfsm_systemd_try_shutdown (XfsmSystemd
gboolean
+xfsm_systemd_try_suspend (XfsmSystemd *systemd,
+ GError **error)
+{
+ if (!xfsm_systemd_lock_screen (error))
+ return FALSE;
+
+ return xfsm_systemd_try_method (systemd,
+ SYSTEMD_SUSPEND_ACTION,
+ error);
+}
+
+
+
+gboolean
+xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
+ GError **error)
+{
+ if (!xfsm_systemd_lock_screen (error))
+ return FALSE;
+
+ return xfsm_systemd_try_method (systemd,
+ SYSTEMD_HIBERNATE_ACTION,
+ error);
+}
+
+
+
+gboolean
xfsm_systemd_can_restart (XfsmSystemd *systemd,
gboolean *can_restart,
GError **error)
@@ -227,3 +276,39 @@ xfsm_systemd_can_shutdown (XfsmSystemd
SYSTEMD_POWEROFF_TEST,
error);
}
+
+
+
+gboolean
+xfsm_systemd_can_suspend (XfsmSystemd *systemd,
+ gboolean *can_suspend,
+ gboolean *auth_suspend,
+ GError **error)
+{
+ gboolean ret = FALSE;
+
+ ret = xfsm_systemd_can_method (systemd,
+ can_suspend,
+ SYSTEMD_SUSPEND_TEST,
+ error);
+ *auth_suspend = *can_suspend;
+ return ret;
+}
+
+
+
+gboolean
+xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
+ gboolean *can_hibernate,
+ gboolean *auth_hibernate,
+ GError **error)
+{
+ gboolean ret = FALSE;
+
+ ret = xfsm_systemd_can_method (systemd,
+ can_hibernate,
+ SYSTEMD_HIBERNATE_TEST,
+ error);
+ *auth_hibernate = *can_hibernate;
+ return ret;
+}
Index: xfce4-session-4.10.1/xfce4-session/xfsm-systemd.h
===================================================================
--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-systemd.h
+++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.h
@@ -42,6 +42,12 @@ gboolean xfsm_systemd_try_restart (
gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
GError **error);
+gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd,
+ GError **error);
+
+gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
+ GError **error);
+
gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd,
gboolean *can_restart,
GError **error);
@@ -50,6 +56,16 @@ gboolean xfsm_systemd_can_shutdown (
gboolean *can_shutdown,
GError **error);
+gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd,
+ gboolean *can_suspend,
+ gboolean *auth_suspend,
+ GError **error);
+
+gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
+ gboolean *can_hibernate,
+ gboolean *auth_hibernate,
+ GError **error);
+
G_END_DECLS
#endif /* __XFSM_SYSTEMD_H__ */
Index: xfce4-session-4.10.1/xfce4-session/xfsm-shutdown.c
===================================================================
--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-shutdown.c
+++ xfce4-session-4.10.1/xfce4-session/xfsm-shutdown.c
@@ -63,15 +63,15 @@
#include <xfce4-session/xfsm-shutdown.h>
#include <xfce4-session/xfsm-compat-gnome.h>
#include <xfce4-session/xfsm-compat-kde.h>
+#include <xfce4-session/xfsm-consolekit.h>
#include <xfce4-session/xfsm-fadeout.h>
#include <xfce4-session/xfsm-global.h>
#include <xfce4-session/xfsm-legacy.h>
#include <xfce4-session/xfsm-upower.h>
#ifdef HAVE_SYSTEMD
+#define LOGIND_RUNNING() (access ("/run/systemd/seats/", F_OK) >= 0)
#include <xfce4-session/xfsm-systemd.h>
-#else
-#include <xfce4-session/xfsm-consolekit.h>
#endif
static void xfsm_shutdown_finalize (GObject *object);
@@ -98,9 +98,8 @@ struct _XfsmShutdown
#ifdef HAVE_SYSTEMD
XfsmSystemd *systemd;
-#else
- XfsmConsolekit *consolekit;
#endif
+ XfsmConsolekit *consolekit;
XfsmUPower *upower;
/* kiosk settings */
@@ -139,10 +138,14 @@ xfsm_shutdown_init (XfsmShutdown *shutdo
XfceKiosk *kiosk;
#ifdef HAVE_SYSTEMD
- shutdown->systemd = xfsm_systemd_get ();
-#else
- shutdown->consolekit = xfsm_consolekit_get ();
+ shutdown->consolekit = NULL;
+ shutdown->systemd = NULL;
+ if (LOGIND_RUNNING())
+ shutdown->systemd = xfsm_systemd_get ();
+ else
#endif
+ shutdown->consolekit = xfsm_consolekit_get ();
+
shutdown->upower = xfsm_upower_get ();
shutdown->helper_state = SUDO_NOT_INITIAZED;
shutdown->helper_require_password = FALSE;
@@ -162,10 +165,11 @@ xfsm_shutdown_finalize (GObject *object)
XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
#ifdef HAVE_SYSTEMD
- g_object_unref (G_OBJECT (shutdown->systemd));
-#else
- g_object_unref (G_OBJECT (shutdown->consolekit));
+ if (shutdown->systemd != NULL)
+ g_object_unref (G_OBJECT (shutdown->systemd));
#endif
+ if (shutdown->consolekit != NULL)
+ g_object_unref (G_OBJECT (shutdown->consolekit));
g_object_unref (G_OBJECT (shutdown->upower));
/* close down helper */
@@ -657,10 +661,11 @@ xfsm_shutdown_try_restart (XfsmShutdown
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
else
#ifdef HAVE_SYSTEMD
- return xfsm_systemd_try_restart (shutdown->systemd, error);
-#else
- return xfsm_consolekit_try_restart (shutdown->consolekit, error);
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_try_restart (shutdown->systemd, error);
+ else
#endif
+ return xfsm_consolekit_try_restart (shutdown->consolekit, error);
}
@@ -678,10 +683,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
else
#ifdef HAVE_SYSTEMD
- return xfsm_systemd_try_shutdown (shutdown->systemd, error);
-#else
- return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_try_shutdown (shutdown->systemd, error);
+ else
#endif
+ return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
}
@@ -692,6 +698,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown
{
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+#ifdef HAVE_SYSTEMD
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_try_suspend (shutdown->systemd, error);
+ else
+#endif
return xfsm_upower_try_suspend (shutdown->upower, error);
}
@@ -703,6 +714,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdow
{
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+#ifdef HAVE_SYSTEMD
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_try_hibernate (shutdown->systemd, error);
+ else
+#endif
return xfsm_upower_try_hibernate (shutdown->upower, error);
}
@@ -722,10 +738,14 @@ xfsm_shutdown_can_restart (XfsmShutdown
}
#ifdef HAVE_SYSTEMD
- if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
-#else
- if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
+ if (LOGIND_RUNNING())
+ {
+ if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
+ return TRUE;
+ }
+ else
#endif
+ if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
return TRUE;
if (xfsm_shutdown_sudo_init (shutdown, error))
@@ -753,10 +773,14 @@ xfsm_shutdown_can_shutdown (XfsmShutdown
}
#ifdef HAVE_SYSTEMD
- if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
-#else
- if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
+ if (LOGIND_RUNNING())
+ {
+ if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
+ return TRUE;
+ }
+ else
#endif
+ if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
return TRUE;
if (xfsm_shutdown_sudo_init (shutdown, error))
@@ -784,6 +808,12 @@ xfsm_shutdown_can_suspend (XfsmShutdown
return TRUE;
}
+#ifdef HAVE_SYSTEMD
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_can_suspend (shutdown->systemd, can_suspend,
+ auth_suspend, error);
+ else
+#endif
return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
auth_suspend, error);
}
@@ -804,6 +834,12 @@ xfsm_shutdown_can_hibernate (XfsmShutdow
return TRUE;
}
+#ifdef HAVE_SYSTEMD
+ if (LOGIND_RUNNING())
+ return xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate,
+ auth_hibernate, error);
+ else
+#endif
return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
auth_hibernate, error);
}

61
xfce4-session.changes
View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Sat Feb 28 21:39:29 UTC 2015 - gber@opensuse.org
- update to version 4.12.0
- Remove AC_CHECK_HEADER_STDBOOL, it was only
added in autoconf 2.69 and we dont use
stdbool.h anyway
- Add symlinks to the old icons (bxo#11513)
- Rename action icon names (bxo#11513)
- Gracefully handle the sessions dir being
readonly (bxo#11307)
- Add ConsoleKit2 support
- Create scripts/xinitrc from scripts/xinitrc.in created by
configure
- Translation updates
-------------------------------------------------------------------
Mon Dec 1 13:07:19 UTC 2014 - gber@opensuse.org
- update to version 4.11.1
- Add DesktopNames to .desktop file
- Export XDG_CURRENT_DESKTOP (Bug #11239)
- Expand usage of xfsm_verbose for debugging
- Don't log errors when trying to close non-existent FDs
- Add error checking for fcntl
- Properly print the dbus error message
- Check the return value of select
- atoi (argv[2]) is unsafe
- Check the return value of gtk_tree_selection_get_selected
- gtk_cell_renderer_text_new is never used
- Minor Autotools Updates
- Add fallback DragonflyBSD support for suspend/hibernate
- Use pkexec for xfsm-shutdown (Bug 9952)
- Handle gpg and ssh agents separately
Patch by Mikhail Efremov
- Non-POSIX compliant test used in startxfce4 (Bug 10828)
Patch by seejay
- Update copyright year (Bug 10768)
- polkit_unix_process_new is deprecated (Bug 10793)
Patch by Baurzhan Muftakhidinov
- Add logind runtime detection to support suspend/hibernate
(Bug 9952) Patch by Guido Berhoerster
- Translation Updates
- drop obsolete
xfce4-session-systemd-suspend-hibernate-support.patch,
xfce4-session-set-desktop-name.patch,
xfce4-session-4.10.1-fix-bashisms.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org
@ -24,6 +72,19 @@ Sun Oct 19 08:17:58 UTC 2014 - gber@opensuse.org
- modify xfce4-session-adapt-session-scripts.patch to set - modify xfce4-session-adapt-session-scripts.patch to set
XDG_CURRENT_DESKTOP (bxo#11239) XDG_CURRENT_DESKTOP (bxo#11239)
-------------------------------------------------------------------
Thu May 1 08:24:20 UTC 2014 - gber@opensuse.org
- update to version 4.11.0
- remove gnome-keyring remains
- remove xfce environment functions and use glib
- add shutdown/reboot functionality for systemd (bxo#8729)
- fix duplicated accelerators
- use the async spawn function of glib
- store the watch function id to avoid possible double free
(bxo#9709)
- translation updates
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 10 13:20:46 UTC 2013 - rmilasan@suse.com Thu Oct 10 13:20:46 UTC 2013 - rmilasan@suse.com

50
xfce4-session.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xfce4-session # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,23 +19,17 @@
%define libname libxfsm-4_6-0 %define libname libxfsm-4_6-0
Name: xfce4-session Name: xfce4-session
Version: 4.10.1 Version: 4.12.0
Release: 0 Release: 0
Summary: Xfce Session Manager Summary: Xfce Session Manager
License: GPL-2.0 License: GPL-2.0
Group: System/GUI/XFCE Group: System/GUI/XFCE
Url: http://docs.xfce.org/xfce/xfce4-session/start 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 gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows
Patch0: xfce4-session-simple-splash-remove-shadows.patch Patch0: xfce4-session-simple-splash-remove-shadows.patch
# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE
Patch1: xfce4-session-adapt-session-scripts.patch Patch1: xfce4-session-adapt-session-scripts.patch
# PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 gber@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 gber@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 ledest@gmail.com -- Fix bashisms in startxfce4 script (backported from upstream git)
Patch4: xfce4-session-4.10.1-fix-bashisms.patch
BuildRequires: iceauth BuildRequires: iceauth
BuildRequires: intltool BuildRequires: intltool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -51,24 +45,10 @@ BuildRequires: pkgconfig(libwnck-1.0)
BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4panel-1.0)
BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfce4util-1.0)
%if 0%{?suse_version} >= 1230
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100
%endif
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
Provides: xfce-utils = %{version}
Obsoletes: xfce-utils <= 4.8.3
Provides: xfce-utils-doc = %{version}
Obsoletes: xfce-utils-doc <= 4.8.3
Provides: xfce-utils-lang = %{version}
Obsoletes: xfce-utils-lang <= 4.8.3
Provides: xfce4-session-doc = %{version}
Obsoletes: xfce4-session-doc <= 4.8.3
Requires: %{name}-branding = %{version} Requires: %{name}-branding = %{version}
%if 0%{?suse_version} >= 1230
Requires: systemd Requires: systemd
%else
Requires: ConsoleKit-x11
%endif
Requires: xfce4-settings Requires: xfce4-settings
Requires: xfconf Requires: xfconf
# bnc#845264 # bnc#845264
@ -82,6 +62,14 @@ Recommends: thunar
Recommends: xfce4-panel Recommends: xfce4-panel
# xfce4-about needs to be dragged at a low level # xfce4-about needs to be dragged at a low level
Recommends: libxfce4ui-tools Recommends: libxfce4ui-tools
Provides: xfce-utils = %{version}
Obsoletes: xfce-utils <= 4.8.3
Provides: xfce-utils-doc = %{version}
Obsoletes: xfce-utils-doc <= 4.8.3
Provides: xfce-utils-lang = %{version}
Obsoletes: xfce-utils-lang <= 4.8.3
Provides: xfce4-session-doc = %{version}
Obsoletes: xfce4-session-doc <= 4.8.3
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -108,8 +96,8 @@ engines for the xfce4-session.
Summary: Upstream Branding of xfce4-session Summary: Upstream Branding of xfce4-session
Group: System/GUI/XFCE Group: System/GUI/XFCE
Supplements: packageand(%{name}:branding-upstream) Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding) Conflicts: otherproviders(%{name}-branding)
Provides: %{name}-branding = %{version}
# BRAND: xfce4-session.xml: Control session parameters such as the tools and # BRAND: xfce4-session.xml: Control session parameters such as the tools and
# BRAND: applications started by default or the splash theme. # BRAND: applications started by default or the splash theme.
BuildArch: noarch BuildArch: noarch
@ -123,9 +111,6 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build %build
xdt-autogen xdt-autogen
@ -144,14 +129,12 @@ install -d -m 755 %{buildroot}%{_datadir}/xfce/applications
%suse_update_desktop_file -r xfce-session-settings XFCE X-XFCE GTK Settings DesktopSettings X-XFCE-SettingsDialog X-XFCE-PersonalSettings %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 %suse_update_desktop_file xfce4-session-logout
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%find_lang %{name} %find_lang %{name}
rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/session/splash-engines/*.la find %{buildroot} -type f -name "*.la" -delete -print
# not needed, shutdown/reboot happens via systemd
%clean rm %{buildroot}%{_datadir}/polkit-1/actions/org.xfce.session.policy \
rm -rf %{buildroot} %{buildroot}%{_libdir}/xfce4/session/xfsm-shutdown-helper
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
@ -191,6 +174,7 @@ rm -rf %{buildroot}
%{_libdir}/libxfsm-*.so.* %{_libdir}/libxfsm-*.so.*
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root)
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)