From 3909811c024d360abcea79183d32b21b082f6df9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 4 Jun 2022 18:43:17 +0000
Subject: Sat Jun  4 18:43:17 UTC 2022

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.
---
 source/l/imagemagick/imagemagick.SlackBuild                 |  2 +-
 source/x/x11/build/xkeyboard-config                         |  2 +-
 source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch | 13 -------------
 source/xap/xscreensaver/xscreensaver.SlackBuild             |  8 ++------
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch

(limited to 'source')

diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index 254d9c7ea..21e77f538 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=imagemagick
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # NOTE:  This is to cope with ImageMagick version numbers such as 5.4.7-4,
 # which occur fairly often (but not always).  If these numbers are all the same,
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xkeyboard-config
+++ b/source/x/x11/build/xkeyboard-config
@@ -1 +1 @@
-2
+1
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 8a1a0ab9f..000000000
--- 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 7a2fbe021..43b6ba02c 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 \
-- 
cgit v1.2.3-65-gdbad