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

[Eric Bélanger]

    Date: Wednesday, July 17, 2013 @ 00:56:09
  Author: eric
Revision: 190799

upgpkg: xscreensaver 5.22-1

Upstream update, Switch to upstream pam file, Clean up depends, Add prepare function

Added:
  xscreensaver/trunk/xscreensaver-add-electricsheep.diff
Modified:
  xscreensaver/trunk/PKGBUILD
Deleted:
  xscreensaver/trunk/add-electricsheep.diff
  xscreensaver/trunk/xscreensaver.pam

-------------------------------------+
 PKGBUILD                            |   26 ++++++++++++++------------
 add-electricsheep.diff              |   12 ------------
 xscreensaver-add-electricsheep.diff |   10 ++++++++++
 xscreensaver.pam                    |    1 -
 4 files changed, 24 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-16 21:17:38 UTC (rev 190798)
+++ PKGBUILD	2013-07-16 22:56:09 UTC (rev 190799)
@@ -2,27 +2,29 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.21
+pkgver=5.22
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm' 'mesa')
+depends=('libglade' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'libxpm' 'gdm')
 optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+        xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec'
+          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
           '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
     --with-pam --with-login-manager --with-gtk --with-gl \
@@ -31,10 +33,10 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  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 -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
   chmod 755 "${pkgdir}/usr/bin/xscreensaver"
   echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
 }

Deleted: add-electricsheep.diff
===================================================================
--- add-electricsheep.diff	2013-07-16 21:17:38 UTC (rev 190798)
+++ add-electricsheep.diff	2013-07-16 22:56:09 UTC (rev 190799)
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
- @GL_KLUDGE@ GL: 				companioncube -root			    \n\
- @GL_KLUDGE@ GL: 				hilbert -root				    \n\
-- at GL_KLUDGE@ GL: 				tronbit -root				    \n
-+ at GL_KLUDGE@ GL: 				tronbit -root				    \n\
-+				electricsheep --root 1				    \n
- 
- 
- 

Added: xscreensaver-add-electricsheep.diff
===================================================================
--- xscreensaver-add-electricsheep.diff	                        (rev 0)
+++ xscreensaver-add-electricsheep.diff	2013-07-16 22:56:09 UTC (rev 190799)
@@ -0,0 +1,10 @@
+--- driver/XScreenSaver.ad.in-orig	2013-07-16 16:47:10.183068023 -0400
++++ driver/XScreenSaver.ad.in	2013-07-16 16:48:23.293473297 -0400
+@@ -157,6 +157,7 @@
+ !
+ *programs:								      \
+ 				maze -root				    \n\
++				electricsheep --root 1			    \n\
+ @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
+ 				attraction -root			    \n\
+ 				blitspin -root				    \n\

Deleted: xscreensaver.pam
===================================================================
--- xscreensaver.pam	2013-07-16 21:17:38 UTC (rev 190798)
+++ xscreensaver.pam	2013-07-16 22:56:09 UTC (rev 190799)
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so