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

Eric Bélanger eric at archlinux.org
Sat Oct 17 18:56:46 UTC 2009


    Date: Saturday, October 17, 2009 @ 14:56:45
  Author: eric
Revision: 56009

Merged revisions 56008 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xscreensaver/trunk

........
  r56008 | eric | 2009-10-17 14:56:27 -0400 (Sat, 17 Oct 2009) | 2 lines
  
  upgpkg: xscreensaver 5.10-2
      Added support for electricsheep (close FS#16400)
........

Added:
  xscreensaver/repos/extra-x86_64/add-electricsheep.diff
    (from rev 56008, xscreensaver/trunk/add-electricsheep.diff)
Modified:
  xscreensaver/repos/extra-x86_64/	(properties)
  xscreensaver/repos/extra-x86_64/ChangeLog
  xscreensaver/repos/extra-x86_64/PKGBUILD

------------------------+
 ChangeLog              |    5 +++++
 PKGBUILD               |   13 +++++++------
 add-electricsheep.diff |   12 ++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)


Property changes on: xscreensaver/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xscreensaver/trunk:1-51611
   + /xscreensaver/trunk:1-56008

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-17 18:56:27 UTC (rev 56008)
+++ extra-x86_64/ChangeLog	2009-10-17 18:56:45 UTC (rev 56009)
@@ -1,3 +1,8 @@
+2009-10-17  Eric Belanger  <eric at archlinux.org>
+
+	* xscreensaver 5.10-2
+	* Added support for electricsheep (close FS#16400)
+
 2009-09-09  Eric Belanger  <eric at archlinux.org>
 
 	* xscreensaver 5.10-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-17 18:56:27 UTC (rev 56008)
+++ extra-x86_64/PKGBUILD	2009-10-17 18:56:45 UTC (rev 56009)
@@ -4,7 +4,7 @@
 
 pkgname=xscreensaver
 pkgver=5.10
-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,15 @@
 makedepends=('bc')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-	xscreensaver.pam LICENSE)
-md5sums=('0d7205f9da8e3f1b83bcda549d73a7c4' '367a3538f54db71f108b34cfa31088ac'\
-         '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('d8379928de2e6e86cc7b17d75150daafe57e93c4' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'\
-         '4209ea586b204fd1d81c382a0522c654f9fd9134')
+	add-electricsheep.diff xscreensaver.pam LICENSE)
+md5sums=('0d7205f9da8e3f1b83bcda549d73a7c4' 'f82524626ed8a6832cd279e0548a9b46'\
+         '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c')
+sha1sums=('d8379928de2e6e86cc7b17d75150daafe57e93c4' '65c2933380267475f2c4560bc22f4350393b00ce'\
+         '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../add-electricsheep.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
     --with-pam --without-motif --with-gtk --without-gnome --with-xml --with-gl \

Copied: xscreensaver/repos/extra-x86_64/add-electricsheep.diff (from rev 56008, xscreensaver/trunk/add-electricsheep.diff)
===================================================================
--- extra-x86_64/add-electricsheep.diff	                        (rev 0)
+++ extra-x86_64/add-electricsheep.diff	2009-10-17 18:56:45 UTC (rev 56009)
@@ -0,0 +1,12 @@
+--- 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 @@
+ -				lcdscrub -root				    \n\
+ @GL_KLUDGE@ GL: 				photopile -root				    \n\
+ @GL_KLUDGE@ GL: 				skytentacles -root			    \n\
+- at GL_KLUDGE@ GL: 				rubikblocks -root			    \n
++ at GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
++				electricsheep --root 1				    \n
+ 
+ 
+ 




More information about the arch-commits mailing list