Update to xscreensaver-6.05.1

Remove Perl stdout bad file descriptor patch
Remove gdk-pixbuf-xlib dependency
Require gtk3

3 files changed, 35 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afa340168579..01d1acca8139 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xscreensaver-arch-logo
 	pkgdesc = Screen saver and locker for the X Window System with Arch Linux branding
-	pkgver = 6.04
-	pkgrel = 3
+	pkgver = 6.05.1
+	pkgrel = 1
 	url = https://www.jwz.org/xscreensaver/
 	arch = x86_64
 	license = BSD
@@ -9,17 +9,17 @@ pkgbase = xscreensaver-arch-logo
 	makedepends = intltool
 	makedepends = libxpm
 	makedepends = systemd
-	depends = gdk-pixbuf-xlib
 	depends = glu
-	depends = gtk2
+	depends = gtk3
 	depends = libxmu
 	depends = perl-libwww
 	depends = xorg-appres
 	optdepends = gdm: for login manager support
+	optdepends = perl-lwp-protocol-https: for MapScroller hack support, per FS #74184
 	provides = xscreensaver
 	conflicts = xscreensaver
 	backup = etc/pam.d/xscreensaver
-	source = xscreensaver-arch-logo-6.04.tar.gz::https://www.jwz.org/xscreensaver/xscreensaver-6.04.tar.gz
+	source = xscreensaver-arch-logo-6.05.1.tar.gz::https://www.jwz.org/xscreensaver/xscreensaver-6.05.1.tar.gz
 	source = LICENSE
 	source = logo-50.gif
 	source = logo-180.gif
@@ -34,7 +34,6 @@ pkgbase = xscreensaver-arch-logo
 	source = logo-50.xpm
 	source = logo-180.xpm
 	source = logo-360.xpm
-	source = perl-stdout-bad-fd.patch
 	sha512sums = 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
 	sha512sums = 529ed9b7904631989803a4e1f306a0f3e496e50a123ebbd6ff77058e52aeb1b2328148d8224e54b547faff14e9d591146b9849c5fb9d1063e6db41f295f3074e
 	sha512sums = a63d93f148500eb8ae4a011286c1e762a38575773381d33fa1c79cb1b94df8bdba54b40c52c5861ab865934f1d3a3a225c1ef5758a698a9e587b0779d76a0a34
@@ -50,6 +49,5 @@ pkgbase = xscreensaver-arch-logo
 	sha512sums = 306f5b305c3e628e660d284d0e6cd5cf2ee939e01dccd7f1c91afe35e49c96f7697ef7e62678eb17647abdc2c7ae6105e33a290fe6b79dbca50b4f9e954b3b47
 	sha512sums = b5172c09bbc65e5adf2ce4ca8c84391aec99cd1d5120380fa6f4878e2ec01a758f10d4ef89c78a93d2d2dd418a6054bdc1d532aac46c47f48cf803f0f83a863b
 	sha512sums = 376892f2dea54cd93c8e2f20ed76b0779ad2a038a6b590da189aedbd8c7fdd4d1f16add323a5f94e3772e0cc7e5ca74a74c20be3da54c637b76577a388e93fce
-	sha512sums = 2cb0dd77589eee09ba2e06d000b13aaee4f5a3a2ffde595559b3b261a2337580e6f3e108e1617e78741f2cb8c66306f2ac2e41c7f97d83510304edd58ea2e023
 
 pkgname = xscreensaver-arch-logo
diff --git a/PKGBUILD b/PKGBUILD
index c35141fe6746..e5b37c81484b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,14 @@
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver-arch-logo
-pkgver=6.04
-pkgrel=3
+pkgver=6.05.1
+pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System with Arch Linux branding"
 url="https://www.jwz.org/${pkgname%%-*}/"
 arch=('x86_64')
 license=('BSD')
-depends=('gdk-pixbuf-xlib'
-         'glu' 
-         'gtk2'
+depends=('glu' 
+         'gtk3'
          'libxmu'         
          'perl-libwww' 
          'xorg-appres') 
@@ -21,26 +20,26 @@ makedepends=('bc'
              'intltool' 
              'libxpm'
              'systemd')
-optdepends=('gdm: for login manager support')
+optdepends=('gdm: for login manager support'
+            'perl-lwp-protocol-https: for MapScroller hack support, per FS #74184')
 conflicts=('xscreensaver')
 provides=('xscreensaver')
 backup=('etc/pam.d/xscreensaver')
 source=("${pkgname}-${pkgver}.tar.gz::https://www.jwz.org/${pkgname%%-*}/${pkgname%%-*}-${pkgver}.tar.gz"
         LICENSE 
-		logo-50.gif
-		logo-180.gif
-		logo-360.gif
-		logo-big.gif
-		logo.pdf
+        logo-50.gif
+        logo-180.gif
+        logo-360.gif
+        logo-big.gif
+        logo.pdf
         logo-32.png
         logo-50.png 
         logo-180.png
-		logo-360.png
-		logo-512.png
-		logo-50.xpm
+        logo-360.png
+        logo-512.png
+        logo-50.xpm
         logo-180.xpm
-		logo-360.xpm
-        perl-stdout-bad-fd.patch) 
+        logo-360.xpm)
 sha512sums=('7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071'
             '529ed9b7904631989803a4e1f306a0f3e496e50a123ebbd6ff77058e52aeb1b2328148d8224e54b547faff14e9d591146b9849c5fb9d1063e6db41f295f3074e'
             'a63d93f148500eb8ae4a011286c1e762a38575773381d33fa1c79cb1b94df8bdba54b40c52c5861ab865934f1d3a3a225c1ef5758a698a9e587b0779d76a0a34'
@@ -55,33 +54,33 @@ sha512sums=('7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585
             'e650ad1351107aef023420bcb7422279efb1f2594362e66b737c960e2a1a5444f4925449ecae5b4ffa3a0127d6645f9d466f3b5d17767c865dcaf438b3b0e44f'
             '306f5b305c3e628e660d284d0e6cd5cf2ee939e01dccd7f1c91afe35e49c96f7697ef7e62678eb17647abdc2c7ae6105e33a290fe6b79dbca50b4f9e954b3b47'
             'b5172c09bbc65e5adf2ce4ca8c84391aec99cd1d5120380fa6f4878e2ec01a758f10d4ef89c78a93d2d2dd418a6054bdc1d532aac46c47f48cf803f0f83a863b'
-            '376892f2dea54cd93c8e2f20ed76b0779ad2a038a6b590da189aedbd8c7fdd4d1f16add323a5f94e3772e0cc7e5ca74a74c20be3da54c637b76577a388e93fce'
-            '2cb0dd77589eee09ba2e06d000b13aaee4f5a3a2ffde595559b3b261a2337580e6f3e108e1617e78741f2cb8c66306f2ac2e41c7f97d83510304edd58ea2e023')
+            '376892f2dea54cd93c8e2f20ed76b0779ad2a038a6b590da189aedbd8c7fdd4d1f16add323a5f94e3772e0cc7e5ca74a74c20be3da54c637b76577a388e93fce')
 
 prepare() {
+  # xscreensaver-6.05.1 bad archive naming fix
+  mv "${srcdir}/${pkgname%%-*}-${pkgver%.*}" "${srcdir}/${pkgname%%-*}-${pkgver}"
+
   local logos_png
   local logos
 
-  patch --directory="${pkgname%%-*}-${pkgver}" --forward --strip=1 --input="${srcdir}/perl-stdout-bad-fd.patch"
-
   cd "${srcdir}"
   logos_png=(logo-32.png
-			 logo-50.png
-			 logo-180.png
-			 logo-360.png)
+             logo-50.png
+             logo-180.png
+             logo-360.png)
   for _pngfile in "${logos_png[@]}"; do
 	install -Dm0644 "${_pngfile}" "${srcdir}/${pkgname%%-*}-${pkgver}/hacks/images/${_pngfile}"
   done
   
   logos=(logo.pdf
-		 logo-50.gif
-		 logo-50.xpm
-		 logo-180.gif
-		 logo-180.xpm
-		 logo-360.gif
-		 logo-360.xpm
-		 logo-512.png
-		 logo-big.gif)
+         logo-50.gif
+         logo-50.xpm
+         logo-180.gif
+         logo-180.xpm
+         logo-360.gif
+         logo-360.xpm
+         logo-512.png
+         logo-big.gif)
   for _file in "${logos[@]}"; do
 	install -Dm0644 "${_file}" "${srcdir}/${pkgname%%-*}-${pkgver}/utils/images/${_file}"
   done
@@ -111,5 +110,4 @@ package() {
   install -d "${pkgdir}/etc/pam.d"
   make install_prefix="${pkgdir}" install
   install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/${pkgname%%-*}-properties.desktop"
 }
diff --git a/perl-stdout-bad-fd.patch b/perl-stdout-bad-fd.patch
deleted file mode 100644
index 9aa8cb9ba4f8..000000000000
--- a/perl-stdout-bad-fd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --unified --recursive --text xscreensaver-6.04.orig/hacks/xscreensaver-getimage-file xscreensaver-6.04.new/hacks/xscreensaver-getimage-file
---- xscreensaver-6.04.orig/hacks/xscreensaver-getimage-file	2022-04-11 05:03:33.093334265 +1200
-+++ xscreensaver-6.04.new/hacks/xscreensaver-getimage-file	2022-09-03 17:26:56.970837016 +1200
-@@ -1545,6 +1545,13 @@
-   my $abs_p = 0;
-   my $flush_p = 0;
- 
-+  # Some time between perl 5.16.3 and 5.28.3, invoking a script with >&-
-+  # started writing "Unable to flush stdout: Bad file descriptor" to stderr
-+  # at exit. So if stdout is closed, open it as /dev/null instead.
-+  #
-+  open (STDOUT, '>', '/dev/null')
-+	if (! defined (syswrite (STDOUT, "")));  # undef if fd closed; 0 if open.
-+
-   while ($_ = $ARGV[0]) {
-     shift @ARGV;
-     if    (m/^--?verbose$/s)      { $verbose++; }