summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Bero2019-01-12 17:41:52 -0600
committerChristopher Bero2019-01-12 17:41:52 -0600
commit4a3f99b73265d54c982c2fea320d694eac91b727 (patch)
treeb5a5d4d5c407303046ae68e0405f932b4a14e685
parent5ff8df55ced564574b1f1ba6d19eb3e6660244e3 (diff)
downloadaur-4a3f99b73265d54c982c2fea320d694eac91b727.tar.gz
Bump to 5.42 with fix for C90 comment error.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--fontglide.c.diff11
3 files changed, 22 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a87ab58d625..269bfcd0e499 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.40
+ pkgver = 5.42
pkgrel = 1
url = http://www.jwz.org/xscreensaver/
arch = i686
@@ -18,13 +18,15 @@ pkgbase = xscreensaver-xmatrix-color
provides = xscreensaver
conflicts = xscreensaver
backup = etc/pam.d/xscreensaver
- source = http://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz
+ source = http://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz
source = xscreensaver-add-electricsheep.diff
source = xmatrix-color.diff
+ source = fontglide.c.diff
source = LICENSE
- sha1sums = 82c7433fe008e6ea9ab8683cf3325a673b8a8233
+ sha1sums = b8eb08e258a70924aa0e644e4930164baf505ee6
sha1sums = e8dc57b6471fb3867ee099304ac6bf628351cb98
sha1sums = faca46b814a8791dfe3619e755089ecb88ddf71c
+ sha1sums = 649c268c0afbb955eb0194a840ab46359f27c94b
sha1sums = bf8995d86609cdab678ca277ae685407f82691db
pkgname = xscreensaver-xmatrix-color
diff --git a/PKGBUILD b/PKGBUILD
index d0525d481555..cf6a22aef387 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
pkgname=xscreensaver-xmatrix-color
-pkgver=5.40
+pkgver=5.42
pkgrel=1
pkgdesc="Screen saver and locker for the X Window System, modified xmatrix with variable color."
arch=('i686' 'x86_64')
@@ -14,18 +14,21 @@ conflicts=('xscreensaver')
provides=('xscreensaver')
backup=('etc/pam.d/xscreensaver')
source=(http://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz
- xscreensaver-add-electricsheep.diff
+ xscreensaver-add-electricsheep.diff
xmatrix-color.diff
+ fontglide.c.diff
LICENSE)
-sha1sums=('82c7433fe008e6ea9ab8683cf3325a673b8a8233'
+sha1sums=('b8eb08e258a70924aa0e644e4930164baf505ee6'
'e8dc57b6471fb3867ee099304ac6bf628351cb98'
'faca46b814a8791dfe3619e755089ecb88ddf71c'
+ '649c268c0afbb955eb0194a840ab46359f27c94b'
'bf8995d86609cdab678ca277ae685407f82691db')
prepare() {
cd ${pkgname%%-*}-${pkgver}
patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
patch -b -p0 -i "${srcdir}/xmatrix-color.diff"
+ patch -b -p0 -i "${srcdir}/fontglide.c.diff"
}
build() {
diff --git a/fontglide.c.diff b/fontglide.c.diff
new file mode 100644
index 000000000000..dd88456e836b
--- /dev/null
+++ b/fontglide.c.diff
@@ -0,0 +1,11 @@
+--- hacks/fontglide.c 2018-09-02 17:56:45.000000000 -0500
++++ hacks/fontglide.c.mod 2019-01-12 17:29:53.166748099 -0600
+@@ -2421,8 +2421,6 @@
+
+ textclient_close (s->tc);
+
+-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
+ XFreeGC (dpy, s->bg_gc);
+ if (s->charset) free (s->charset);
+ if (s->font_override) free (s->font_override);