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

[Eric Bélanger]

    Date: Wednesday, July 22, 2015 @ 03:56:20
  Author: eric
Revision: 242411

upgpkg: xscreensaver 5.33-2

Fix missing escape in xscreensaver-text (close FS#45524)

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-21 20:26:07 UTC (rev 242410)
+++ PKGBUILD	2015-07-22 01:56:20 UTC (rev 242411)
@@ -3,7 +3,7 @@
 
 pkgname=xscreensaver
 pkgver=5.33
-pkgrel=1
+pkgrel=2
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
@@ -13,14 +13,18 @@
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-        xscreensaver-add-electricsheep.diff LICENSE)
+        xscreensaver-add-electricsheep.diff
+	xscreensaver-missingescape.patch
+	LICENSE)
 sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+          'ab2962f497e0b50a2ffe135baefdc155b0be1413'
           '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+  patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
 }
 
 build() {

Added: xscreensaver-missingescape.patch
===================================================================
--- xscreensaver-missingescape.patch	                        (rev 0)
+++ xscreensaver-missingescape.patch	2015-07-22 01:56:20 UTC (rev 242411)
@@ -0,0 +1,12 @@
+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)
+