summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-06-04 18:43:17 +0000
committerEric Hameleers <alien@slackware.com>2022-06-05 07:00:07 +0200
commit3909811c024d360abcea79183d32b21b082f6df9 (patch)
tree79bf33a11062066ee9529c5e5a77c0425cb40584 /source/xap
parent6ca2f33fd964f40524b2ced4d7da427e480d9a0b (diff)
downloadcurrent-3909811c024d360abcea79183d32b21b082f6df9.tar.gz
Sat Jun 4 18:43:17 UTC 202220220604184317
ap/htop-3.2.1-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_36-x86_64-1.txz: Upgraded. l/jasper-3.0.4-x86_64-1.txz: Upgraded. x/OpenCC-1.1.4-x86_64-1.txz: Upgraded. x/xkeyboard-config-2.36-noarch-1.txz: Upgraded. xap/pidgin-2.14.10-x86_64-1.txz: Upgraded. This update fixes bugs and several security issues. For more information, see: https://www.pidgin.im/posts/2022-06-2.14.10-released/ (* Security fix *) xap/xscreensaver-6.04-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch13
-rwxr-xr-xsource/xap/xscreensaver/xscreensaver.SlackBuild8
2 files changed, 2 insertions, 19 deletions
diff --git a/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch b/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
deleted file mode 100644
index 8a1a0ab9..00000000
--- a/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in xscreensaver-5.45/driver/screensaver-properties.desktop.in
---- xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in 2009-10-06 21:26:41.000000000 -0500
-+++ xscreensaver-5.45/driver/screensaver-properties.desktop.in 2020-12-15 20:12:13.223955366 -0600
-@@ -2,7 +2,7 @@
- Exec=xscreensaver-demo
- Icon=xscreensaver
- Terminal=false
--_Name=Screensaver
--_Comment=Change screensaver properties
-+_Name=XScreenSaver
-+_Comment=Change XScreenSaver properties
- Type=Application
- Categories=Settings;DesktopSettings;Security;X-XFCE;
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index 7a2fbe02..43b6ba02 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -88,10 +88,6 @@ fi
# Add support for the electricsheep distributed screensaver:
zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-# Make the description of the xscreensaver settings be clearly for xscreensaver
-# as opposed to a generic "screensaver" settings
-zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -106,7 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
- --with-x-app-defaults=/etc/X11/app-defaults \
+ --with-app-defaults=/etc/X11/app-defaults \
--with-text-file=/usr/doc/netdate/COPYRIGHT \
$USE_SHADOW \
$USE_PAM \