OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=140

additional-lockers-support.patch

@@ -0,0 +1,13 @@
+diff -ru a/scripts/xflock4 b/scripts/xflock4
+--- a/scripts/xflock4	2014-08-31 02:24:02.000000000 +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

xfce4-session-4.12.1.tar.bz2

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

xfce4-session-Make-verbose-logging-conditional.patch

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

xfce4-session-simple-splash-remove-shadows.patch

@@ -0,0 +1,27 @@
+diff -urNp xfce4-session-4.8.0.orig/engines/simple/simple.c xfce4-session-4.8.0/engines/simple/simple.c
+--- xfce4-session-4.8.0.orig/engines/simple/simple.c	2011-01-16 17:38:20.000000000 +0100
++++ xfce4-session-4.8.0/engines/simple/simple.c	2011-02-02 18:44:31.000000000 +0100
+@@ -213,7 +213,6 @@ static void
+ simple_next (XfsmSplashEngine *engine, const gchar *text)
+ {
+   Simple *simple = (Simple *) engine->user_data;
+-  GdkColor shcolor;
+   gint tw, th, tx, ty;
+ 
+   pango_layout_set_text (simple->layout, text, -1);
+@@ -231,15 +230,6 @@ simple_next (XfsmSplashEngine *engine, c
+ 
+   gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
+ 
+-  /* draw shadow */
+-  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
+-  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
+-  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
+-  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
+-  shcolor.green = shcolor.red;
+-  shcolor.blue = shcolor.red;
+-
+-  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
+   gdk_draw_layout (simple->pixmap, simple->gc,
+                    tx + 2, ty + 2, simple->layout);
+ 

xfce4-session-systemd-user-addons.patch

@@ -0,0 +1,34 @@
+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