summaryrefslogtreecommitdiff
path: root/source/xfce
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-01-05 00:27:10 +0000
committerEric Hameleers <alien@slackware.com>2021-01-05 08:59:48 +0100
commit10a7e72a8baac4003347b6ef8d421179d364750c (patch)
treeca1651293d15abc16c4b274b76fb2930569da3d0 /source/xfce
parent4f5caa67e6249f03459f2f09ff518ca5fffdc694 (diff)
downloadcurrent-10a7e72a8baac4003347b6ef8d421179d364750c.tar.gz
Tue Jan 5 00:27:10 UTC 202120210105002710
a/haveged-1.9.14-x86_64-1.txz: Upgraded. ap/ispell-3.4.01-x86_64-1.txz: Upgraded. d/distcc-3.3.5-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/cantor-20.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/kfilemetadata-5.77.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/kile-2.9.93-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/kitinerary-20.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/krita-4.4.1-x86_64-3.txz: Rebuilt. Recompiled against poppler-21.01.0. kde/okular-20.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.01.0. l/imagemagick-7.0.10_55-x86_64-1.txz: Upgraded. l/jasper-2.0.24-x86_64-1.txz: Upgraded. l/mozilla-nss-3.60.1-x86_64-1.txz: Upgraded. l/ocl-icd-2.2.14-x86_64-1.txz: Upgraded. l/poppler-21.01.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-idna-3.1-x86_64-1.txz: Upgraded. l/python-pillow-8.1.0-x86_64-1.txz: Upgraded. n/dehydrated-0.7.0-noarch-1.txz: Added. This is a Let's Encrypt / ACME setup script. Thanks to Heinz Wiesinger. n/dovecot-2.3.13-x86_64-1.txz: Upgraded. n/fetchmail-6.4.15-x86_64-1.txz: Upgraded. n/nettle-3.7-x86_64-1.txz: Upgraded. tcl/tcl-8.6.11-x86_64-1.txz: Upgraded. tcl/tk-8.6.11-x86_64-1.txz: Upgraded. xfce/xfce4-screensaver-0.1.11-x86_64-4.txz: Rebuilt. Don't ship unneeded autostart file. Thanks to ljb643.
Diffstat (limited to 'source/xfce')
-rw-r--r--source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch33
-rwxr-xr-xsource/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild10
2 files changed, 5 insertions, 38 deletions
diff --git a/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
deleted file mode 100644
index 8db50475..00000000
--- a/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f596f888a2b6e6598b9d0e4f0200b60e7f9eef64 Mon Sep 17 00:00:00 2001
-From: Shawn Anastasio <shawn@anastas.io>
-Date: Sun, 6 Sep 2020 19:33:12 +0000
-Subject: [PATCH] Catch gs_listener_dbus_init failures
-
-In cases where the dbus connection fails, gs_listener_dbus_init
-will fail and return FALSE. Previously, this status code was not
-checked in the gs_listener constructor, resulting in a silent failure
-that eventually resulted in a Segmentation Fault when the listener's
-system_connection pointer gets used.
-
-Add a g_assert to ensure gs_listener_dbus_init succeeds, or bail out
-gracefully on failures.
----
- src/gs-listener-dbus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 6307324..7aebe00 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -2196,7 +2196,7 @@ gs_listener_init (GSListener *listener) {
- #endif
- listener->priv->prefs = gs_prefs_new();
-
-- gs_listener_dbus_init (listener);
-+ g_assert (gs_listener_dbus_init (listener));
-
- init_session_id (listener);
-
---
-2.29.2
-
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index c574e5b9..88897085 100755
--- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-screensaver
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -79,9 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Revert this one: https://gitlab.xfce.org/apps/xfce4-screensaver/-/issues/66
-zcat $CWD/0001-Catch-gs_listener_dbus_init-failures.patch.gz | patch -p1 -R || exit 1
-
# Clarify description in Xfce Settings menu
zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
@@ -102,10 +99,13 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-locking \
--build=$ARCH-slackware-linux || exit 1
-
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship autostart file. This will start without it.
+rm -f $PKG/etc/xdg/autostart/xfce4-screensaver.desktop
+rmdir $PKG/etc/xdg/autostart
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true