Sun Dec 27 22:52:10 UTC 202020201227225210

And, just a month after Xfce 4.14 appeared in vtown, we have Xfce 4.16 updates
in the main tree. Thanks much to Robby Workman for making it happen. :-)
a/aaa_terminfo-6.2_20201219-x86_64-1.txz:  Upgraded.
a/ndctl-71.1-x86_64-2.txz:  Rebuilt.
  Fix bash-completion file installation (previously it was causing the
  completion dir to have mode 0644). Thanks to Robby Workman.
l/harfbuzz-2.7.4-x86_64-1.txz:  Upgraded.
l/libarchive-3.5.1-x86_64-1.txz:  Upgraded.
l/libgtop-2.40.0-x86_64-1.txz:  Added.
  This is used by libxfce4ui to provide extra information in the about page.
l/ncurses-6.2_20201219-x86_64-1.txz:  Upgraded.
n/wpa_supplicant-2.9-x86_64-4.txz:  Rebuilt.
  Fix desktop file to not show if kdesu isn't available. Thanks to Hyperion.
x/xterm-363-x86_64-1.txz:  Upgraded.
xap/xsnow-3.2.0-x86_64-1.txz:  Upgraded.
xfce/Greybird-3.22.13-noarch-2.txz:  Rebuilt.
xfce/exo-4.16.0-x86_64-1.txz:  Upgraded.
xfce/garcon-0.8.0-x86_64-1.txz:  Upgraded.
xfce/libxfce4ui-4.16.0-x86_64-1.txz:  Upgraded.
xfce/libxfce4util-4.16.0-x86_64-1.txz:  Upgraded.
xfce/mousepad-0.5.1-x86_64-2.txz:  Rebuilt.
xfce/thunar-4.16.0-x86_64-1.txz:  Upgraded.
xfce/thunar-volman-4.16.0-x86_64-1.txz:  Upgraded.
xfce/tumbler-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-appfinder-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-clipman-plugin-1.6.1-x86_64-2.txz:  Rebuilt.
xfce/xfce4-dev-tools-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-notifyd-0.6.2-x86_64-2.txz:  Rebuilt.
xfce/xfce4-panel-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-panel-profiles-1.0.10-x86_64-2.txz:  Rebuilt.
xfce/xfce4-power-manager-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-2.txz:  Rebuilt.
xfce/xfce4-screensaver-0.1.11-x86_64-3.txz:  Rebuilt.
xfce/xfce4-screenshooter-1.9.8-x86_64-1.txz:  Upgraded.
xfce/xfce4-session-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-settings-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-systemload-plugin-1.2.4-x86_64-2.txz:  Rebuilt.
xfce/xfce4-taskmanager-1.2.3-x86_64-2.txz:  Rebuilt.
xfce/xfce4-terminal-0.8.10-x86_64-1.txz:  Upgraded.
xfce/xfce4-weather-plugin-0.10.2-x86_64-2.txz:  Rebuilt.
xfce/xfce4-whiskermenu-plugin-2.5.0-x86_64-1.txz:  Upgraded.
xfce/xfconf-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfdesktop-4.16.0-x86_64-1.txz:  Upgraded.
xfce/xfwm4-4.16.0-x86_64-1.txz:  Upgraded.

3 files changed, 40 insertions, 8 deletions

diff --git a/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch b/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch
new file mode 100644
index 000000000..200432b31
--- /dev/null
+++ b/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch
@@ -0,0 +1,36 @@
+From 56d273ee48fffc7fed67ec7b22afd8e4b1c23c6e Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan@xfce.org>
+Date: Fri, 25 Dec 2020 18:39:52 +0100
+Subject: [PATCH] compositor: Ignore XError when changing background picture
+
+If xfwm4 is compiled with support for the root pixmap in the compositor,
+changing the background image may cause an XError if the external pixmap
+is already freed.
+
+Guard against such XError.
+
+Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
+Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/476
+---
+ src/compositor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/compositor.c b/src/compositor.c
+index 9c5ceb454..8ff0dad42 100644
+--- a/src/compositor.c
++++ b/src/compositor.c
+@@ -3774,8 +3774,11 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
+             ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window);
+             if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile))
+             {
++                myDisplayErrorTrapPush (display_info);
+                 XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
+                 XRenderFreePicture (display_info->dpy, screen_info->rootTile);
++                myDisplayErrorTrapPopIgnored (display_info);
++
+                 screen_info->rootTile = None;
+                 damage_screen (screen_info);
+ 
+-- 
+2.29.2
+
diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild
index bb5fd18f9..6a5b3b67e 100755
--- a/source/xfce/xfwm4/xfwm4.SlackBuild
+++ b/source/xfce/xfwm4/xfwm4.SlackBuild
@@ -80,6 +80,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Fix Issue 476
+zcat $CWD/0001-compositor-Ignore-XError-when-changing-background-pi.patch.gz | patch -p1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xfce/xfwm4/xinitrc.xfce b/source/xfce/xfwm4/xinitrc.xfce
index 82c0dd409..4665547a3 100644
--- a/source/xfce/xfwm4/xinitrc.xfce
+++ b/source/xfce/xfwm4/xinitrc.xfce
@@ -1,7 +1,4 @@
 #!/bin/sh
-#  xinitrc.xfce - modified to work around xfce4session bug
-#                 https://bugzilla.xfce.org/show_bug.cgi?id=8841
-
 
 ########################################################################
 ##  Merge in defaults and keymaps                                     ##
@@ -32,9 +29,5 @@ fi
 ##  Start xfce Desktop Environment                                    ##
 ########################################################################
 
-if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-  exec ck-launch-session dbus-launch --exit-with-session /usr/bin/startxfce4
-else
-  exec dbus-launch --exit-with-session /usr/bin/startxfce4
-fi
+exec /usr/bin/startxfce4