summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/xscreensaver/PKGBUILD10
-rw-r--r--libre/xscreensaver/xscreensaver-missingescape.patch12
2 files changed, 19 insertions, 3 deletions
diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD
index 90090241f..12da550fd 100644
--- a/libre/xscreensaver/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 242235 2015-07-15 00:22:03Z eric $
+# $Id: PKGBUILD 242411 2015-07-22 01:56:20Z eric $
# Maintainer (Arch): Eric BĂ©langer <eric@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=xscreensaver
_pkgname=$pkgname-libre
pkgver=5.33
-pkgrel=1.parabola1
+pkgrel=2.parabola1
pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64')
url="http://www.jwz.org/xscreensaver/"
@@ -18,10 +18,13 @@ conflicts=("${_pkgname}")
backup=('etc/pam.d/xscreensaver')
mksource=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz)
source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
- xscreensaver-add-electricsheep.diff LICENSE)
+ xscreensaver-add-electricsheep.diff
+ xscreensaver-missingescape.patch
+ LICENSE)
mksha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd')
sha1sums=('0fb0df0dc708a56287e0b25d62bfe9a01da945be'
'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+ 'ab2962f497e0b50a2ffe135baefdc155b0be1413'
'3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
mksource() {
@@ -34,6 +37,7 @@ mksource() {
prepare() {
cd ${pkgname}-${pkgver}
patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+ patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
}
build() {
diff --git a/libre/xscreensaver/xscreensaver-missingescape.patch b/libre/xscreensaver/xscreensaver-missingescape.patch
new file mode 100644
index 000000000..a4cb18b41
--- /dev/null
+++ b/libre/xscreensaver/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)
+