Merge branch 'master' of https://aur.archlinux.org/xscreensaver-arch-logo

2 files changed, 26 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4dd8cd970e9c..642bd22c0ad7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xscreensaver-arch-logo-nogdm
 	pkgdesc = Screen saver and locker for the X Window System with Arch Linux branding
-	pkgver = 5.40
+	pkgver = 5.42
 	pkgrel = 1
 	url = http://www.jwz.org/xscreensaver/
 	arch = x86_64
@@ -17,13 +17,13 @@ pkgbase = xscreensaver-arch-logo-nogdm
 	provides = xscreensaver
 	conflicts = xscreensaver
 	backup = etc/pam.d/xscreensaver
-	source = http://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz
+	source = http://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz
 	source = LICENSE
 	source = logo-50.xpm
 	source = logo-180.xpm
 	source = logo-50.png
 	source = logo-180.png
-	sha1sums = 82c7433fe008e6ea9ab8683cf3325a673b8a8233
+	sha1sums = b8eb08e258a70924aa0e644e4930164baf505ee6
 	sha1sums = 3eedb8b91b13c29df9b1fe5cbb027e1470b802d2
 	sha1sums = 5ff6dfd0a14ca484d4287647c3e00af8e417163c
 	sha1sums = 63ed187b08864993684f826dc87b1c5f42ea5bf4
diff --git a/PKGBUILD b/PKGBUILD
index ebac3919df7a..9c468b01b5a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: graysky <graysky AT archlinux DOT us>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Contributer: Eric Belanger <eric@archlinux.org>
 # Contributor: Jakub Kądziołka <kuba@kadziolka.net>
 
 pkgname=xscreensaver-arch-logo-nogdm
-pkgver=5.40
+pkgver=5.42
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System with Arch Linux branding"
-arch=('x86_64')
 url="http://www.jwz.org/xscreensaver/"
+arch=('x86_64')
 license=('BSD')
 depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww' 'pam')
 makedepends=('bc' 'intltool' 'libxpm')
@@ -17,20 +18,34 @@ provides=('xscreensaver')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz
 LICENSE logo-50.xpm logo-180.xpm logo-50.png logo-180.png)
-sha1sums=('82c7433fe008e6ea9ab8683cf3325a673b8a8233'
+sha1sums=('b8eb08e258a70924aa0e644e4930164baf505ee6'
           '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
           '5ff6dfd0a14ca484d4287647c3e00af8e417163c'
           '63ed187b08864993684f826dc87b1c5f42ea5bf4'
           '203ca4f21e0d42263fc0ebb796eaf968c457d93a'
           '619cff60b77812545493dbedb0ba247a37f381e5')
+prepare() {
+  cd "${pkgname%%-*}-${pkgver}"
+  sed 's|-std=c89||' -i configure.in
+  autoreconf -fiv
+}
 
 build() {
   cd "${pkgname%%-*}-${pkgver}"
   install -Dm644 "$srcdir"/logo-180.xpm  "${srcdir}"/${pkgname%%-*}-${pkgver}/utils/images/logo-180.xpm
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --without-login-manager --with-gtk --with-gl \
-    --without-gle --with-pixbuf --with-jpeg
+    ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --with-x-app-defaults=/usr/share/X11/app-defaults \
+    --with-pam \
+    --without-login-manager \
+    --with-gtk \
+    --with-gl \
+    --without-gle \
+    --with-pixbuf \
+    --with-jpeg
   make
 }
 
@@ -38,7 +53,7 @@ package() {
   cd "${pkgname%%-*}-${pkgver}"
   install -d "${pkgdir}/etc/pam.d"
   make install_prefix="${pkgdir}" install
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname%%-*}/LICENSE"
+  install -Dm 644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname%%-*}"
   chmod 755 "${pkgdir}/usr/bin/xscreensaver"
   echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
 }