Update to 5.33-2

3 files changed, 19 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e0e2d6912d1..a4399f612ca6 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 = 1
+	pkgrel = 2
 	url = http://www.jwz.org/xscreensaver/
 	arch = i686
 	arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = xscreensaver-arch-logo
 	source = http://www.jwz.org/xscreensaver/xscreensaver-5.33.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
@@ -29,6 +30,7 @@ pkgbase = xscreensaver-arch-logo
 	sha256sums = d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d
 	sha256sums = c78db4518d1e439811e177638015c7152c5714f13d1cdb32e5d1f53695c52fec
 	sha256sums = 164903ea70ff499c32a54a940d08cd0510893decbabed7707f6c29a5887ec730
+	sha256sums = 1e098a46673e20daba425dd536dfebab838cd0662f556b9a18a7c363953bd39e
 	sha256sums = 82366926a2a81bd08459327936ba144e8b3ea5ee4a386c268bd898e1791ab1a0
 	sha256sums = 253f0d5bbdd841f21a7bbdbb0fd7ded21f711751d5cb1b7914952bdd6541b36d
 	sha256sums = 8027bdb2b4328d154a8e517bdb94f5ef4a9eb031e79a285dabedd62acfa77317
diff --git a/PKGBUILD b/PKGBUILD
index eaacdb1732df..ccb471596d37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xscreensaver-arch-logo
 pkgver=5.33
-pkgrel=1
+pkgrel=2
 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,10 +17,12 @@ 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'
             'c78db4518d1e439811e177638015c7152c5714f13d1cdb32e5d1f53695c52fec'
             '164903ea70ff499c32a54a940d08cd0510893decbabed7707f6c29a5887ec730'
+            '1e098a46673e20daba425dd536dfebab838cd0662f556b9a18a7c363953bd39e'
             '82366926a2a81bd08459327936ba144e8b3ea5ee4a386c268bd898e1791ab1a0'
             '253f0d5bbdd841f21a7bbdbb0fd7ded21f711751d5cb1b7914952bdd6541b36d'
             '8027bdb2b4328d154a8e517bdb94f5ef4a9eb031e79a285dabedd62acfa77317'
@@ -29,6 +31,7 @@ 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
new file mode 100644
index 000000000000..a4cb18b41a0b
--- /dev/null
+++ b/xscreensaver-missingescape.patch
@@ -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)
+