summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2015-10-27 13:50:59 -0400
committergraysky2015-10-27 13:50:59 -0400
commit2660c864608a3d4bb69032c77b136796ac82964f (patch)
treecb0a7a81afbf3ddbe0cb0bce5ce02742f30092a9
parent1b1cd33a935c9e082dc85336a3cf8e4dfabe1d78 (diff)
downloadaur-2660c864608a3d4bb69032c77b136796ac82964f.tar.gz
Update to 5.34-1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD9
-rw-r--r--xscreensaver-missingescape.patch12
3 files changed, 7 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4399f612ca6..796f96f72fd5 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 = 5.33
- pkgrel = 2
+ pkgver = 5.34
+ pkgrel = 1
url = http://www.jwz.org/xscreensaver/
arch = i686
arch = x86_64
@@ -19,18 +19,16 @@ pkgbase = xscreensaver-arch-logo
provides = xscreensaver
conflicts = xscreensaver
backup = etc/pam.d/xscreensaver
- source = http://www.jwz.org/xscreensaver/xscreensaver-5.33.tar.gz
+ source = http://www.jwz.org/xscreensaver/xscreensaver-5.34.tar.gz
source = xscreensaver-add-electricsheep.diff
source = LICENSE
- source = xscreensaver-missingescape.patch
source = logo-50.xpm
source = logo-180.xpm
source = logo-50.png
source = logo-180.png
- sha256sums = d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d
+ sha256sums = 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27
sha256sums = c78db4518d1e439811e177638015c7152c5714f13d1cdb32e5d1f53695c52fec
sha256sums = 164903ea70ff499c32a54a940d08cd0510893decbabed7707f6c29a5887ec730
- sha256sums = 1e098a46673e20daba425dd536dfebab838cd0662f556b9a18a7c363953bd39e
sha256sums = 82366926a2a81bd08459327936ba144e8b3ea5ee4a386c268bd898e1791ab1a0
sha256sums = 253f0d5bbdd841f21a7bbdbb0fd7ded21f711751d5cb1b7914952bdd6541b36d
sha256sums = 8027bdb2b4328d154a8e517bdb94f5ef4a9eb031e79a285dabedd62acfa77317
diff --git a/PKGBUILD b/PKGBUILD
index ccb471596d37..c53a5f407ab1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributer: Eric Belanger <eric@archlinux.org>
pkgname=xscreensaver-arch-logo
-pkgver=5.33
-pkgrel=2
+pkgver=5.34
+pkgrel=1
pkgdesc="Screen saver and locker for the X Window System with Arch Linux branding"
arch=('i686' 'x86_64')
url="http://www.jwz.org/xscreensaver/"
@@ -17,12 +17,10 @@ provides=('xscreensaver')
backup=('etc/pam.d/xscreensaver')
source=(http://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz
xscreensaver-add-electricsheep.diff LICENSE
-xscreensaver-missingescape.patch
logo-50.xpm logo-180.xpm logo-50.png logo-180.png)
-sha256sums=('d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d'
+sha256sums=('6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27'
'c78db4518d1e439811e177638015c7152c5714f13d1cdb32e5d1f53695c52fec'
'164903ea70ff499c32a54a940d08cd0510893decbabed7707f6c29a5887ec730'
- '1e098a46673e20daba425dd536dfebab838cd0662f556b9a18a7c363953bd39e'
'82366926a2a81bd08459327936ba144e8b3ea5ee4a386c268bd898e1791ab1a0'
'253f0d5bbdd841f21a7bbdbb0fd7ded21f711751d5cb1b7914952bdd6541b36d'
'8027bdb2b4328d154a8e517bdb94f5ef4a9eb031e79a285dabedd62acfa77317'
@@ -31,7 +29,6 @@ sha256sums=('d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d'
prepare() {
cd "${pkgname%%-*}-${pkgver}"
patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
- patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
}
build() {
diff --git a/xscreensaver-missingescape.patch b/xscreensaver-missingescape.patch
deleted file mode 100644
index a4cb18b41a0b..000000000000
--- a/xscreensaver-missingescape.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xscreensaver-5.33-orig/driver/xscreensaver-text xscreensaver-5.33/driver/xscreensaver-text
---- xscreensaver-5.33-orig/driver/xscreensaver-text 2015-07-21 21:12:53.283286533 -0400
-+++ xscreensaver-5.33/driver/xscreensaver-text 2015-07-21 21:16:48.589580345 -0400
-@@ -473,7 +473,7 @@
-
- # Try to omit all tables, since they're impossible to read as text.
- #
-- 1 while (s/{{[^{}]*}}/ /gs); # {{ ... }}
-+ 1 while (s/{\{[^{}]*}}/ /gs); # {{ ... }}
- 1 while (s/{\|.*?\|}/\n\n/gs); # {| ... |}
- 1 while (s/\|-.*?\|/ /gs); # |- ... | (table cell)
-