Updated to 6.02

3 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 783f00007e26..52b1d64408cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xscreensaver-xmatrix-color
 	pkgdesc = Screen saver and locker for the X Window System, modified xmatrix with variable color.
-	pkgver = 5.45
+	pkgver = 6.02
 	pkgrel = 1
 	url = http://www.jwz.org/xscreensaver/
 	arch = i686
@@ -14,18 +14,18 @@ pkgbase = xscreensaver-xmatrix-color
 	depends = glu
 	depends = xorg-appres
 	depends = perl-libwww
+	depends = gdk-pixbuf-xlib
 	optdepends = gdm: for login manager support
 	provides = xscreensaver
 	conflicts = xscreensaver
 	backup = etc/pam.d/xscreensaver
-	source = http://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
+	source = http://www.jwz.org/xscreensaver/xscreensaver-6.02.tar.gz
 	source = xscreensaver-add-electricsheep.diff
 	source = xmatrix-color.diff
 	source = LICENSE
-	sha1sums = 933cd5451bdfc4a2bf15bc49f629a8c8665cae62
+	sha1sums = fd87403e1f5a3e98867362cb0046cdd83b2d9dd9
 	sha1sums = e8dc57b6471fb3867ee099304ac6bf628351cb98
-	sha1sums = 1922fb51bcc07df2b74a7220ac4d2f6b17e9a5bc
+	sha1sums = 061a488885bf0265529a04772eae63b24912c1a1
 	sha1sums = bf8995d86609cdab678ca277ae685407f82691db
 
 pkgname = xscreensaver-xmatrix-color
-
diff --git a/PKGBUILD b/PKGBUILD
index 0a36da6d8cdd..90a780148410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id$
 
 pkgname=xscreensaver-xmatrix-color
-pkgver=5.45
+pkgver=6.02
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System, modified xmatrix with variable color."
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
+depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww' 'gdk-pixbuf-xlib')
 makedepends=('bc' 'intltool' 'libxpm')
 optdepends=('gdm: for login manager support')
 conflicts=('xscreensaver')
@@ -17,9 +17,9 @@ source=(http://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz
 	xscreensaver-add-electricsheep.diff
 	xmatrix-color.diff
 	LICENSE)
-sha1sums=('933cd5451bdfc4a2bf15bc49f629a8c8665cae62'
+sha1sums=('fd87403e1f5a3e98867362cb0046cdd83b2d9dd9'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '1922fb51bcc07df2b74a7220ac4d2f6b17e9a5bc'
+          '061a488885bf0265529a04772eae63b24912c1a1'
           'bf8995d86609cdab678ca277ae685407f82691db')
 
 prepare() {
@@ -31,7 +31,7 @@ prepare() {
 build() {
   cd ${pkgname%%-*}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
+    --libexecdir=/usr/lib \
     --with-pam --with-login-manager --with-gtk --with-gl \
     --without-gle --with-pixbuf --with-jpeg
   make
diff --git a/xmatrix-color.diff b/xmatrix-color.diff
index 08c7945d972c..d9d416ad92b6 100644
--- a/xmatrix-color.diff
+++ b/xmatrix-color.diff
@@ -177,9 +177,9 @@
    </hgroup>
  
    <hgroup>
---- hacks/xmatrix.man	2018-04-08 12:56:39.000000000 -0500
-+++ hacks/xmatrix.man.mod	2020-03-22 16:23:50.436339568 -0500
-@@ -26,6 +26,7 @@
+--- hacks/xmatrix.man	2021-01-25 10:00:59.634582133 -0600
++++ hacks/xmatrix.man.mod	2021-10-22 10:25:36.214586238 -0500
+@@ -13,6 +13,7 @@
  [\-mode \fImode\fP]
  [\-phone \fInumber\fP]
  [\-fps]
@@ -187,14 +187,15 @@
  .SH DESCRIPTION
  The \fIxmatrix\fP program draws the 2D "digital rain" effect, as seen on
  the computer monitors in the Wachowski brothers' film, "The Matrix".
-@@ -120,6 +121,10 @@
- xmatrix -ascii -program 'ps -eo comm | rev'
- xmatrix -program 'od -txC -w6 /dev/random'
- xmatrix -program 'cat /dev/random'
+@@ -109,6 +110,10 @@
+ 	xmatrix -ascii -program 'ps -eo comm | rev'
+ 	xmatrix -program 'od -txC -w6 /dev/random'
+ 	xmatrix -program 'cat /dev/random'
 +.TP 8
-+.B \-color-shift \fIcolor\fP
-+Specify a simple color shift to one of:
++.B \-color\-shift \fIcolor\fP
++Specify a simple color, one of:
 +red, purple, blue, aqua, yellow, white, grey
- .EE
+ .sp
+ .fi
  .SH ENVIRONMENT
- .PP
+