[arch-commits] Commit in xscreensaver/trunk (2 files)

[Eric Bélanger]

    Date: Tuesday, October 27, 2015 @ 03:51:07
  Author: eric
Revision: 249781

upgpkg: xscreensaver 5.34-1

Upstream update

Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/xscreensaver-missingescape.patch

----------------------------------+
 PKGBUILD                         |    9 +++------
 xscreensaver-missingescape.patch |   12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-27 00:50:18 UTC (rev 249780)
+++ PKGBUILD	2015-10-27 02:51:07 UTC (rev 249781)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.33
-pkgrel=2
+pkgver=5.34
+pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
@@ -14,17 +14,14 @@
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
         xscreensaver-add-electricsheep.diff
-	xscreensaver-missingescape.patch
 	LICENSE)
-sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
+sha1sums=('a6d9a391981730cedcd51e75c35ffb4101928cc2'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          'ab2962f497e0b50a2ffe135baefdc155b0be1413'
           '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-  patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
 }
 
 build() {

Deleted: xscreensaver-missingescape.patch
===================================================================
--- xscreensaver-missingescape.patch	2015-10-27 00:50:18 UTC (rev 249780)
+++ xscreensaver-missingescape.patch	2015-10-27 02:51:07 UTC (rev 249781)
@@ -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)
-