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

Eric Bélanger eric at archlinux.org
Mon Jul 30 21:28:55 UTC 2012


    Date: Monday, July 30, 2012 @ 17:28:55
  Author: eric
Revision: 164332

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xscreensaver/repos/extra-i686/LICENSE
    (from rev 164331, xscreensaver/trunk/LICENSE)
  xscreensaver/repos/extra-i686/PKGBUILD
    (from rev 164331, xscreensaver/trunk/PKGBUILD)
  xscreensaver/repos/extra-i686/add-electricsheep.diff
    (from rev 164331, xscreensaver/trunk/add-electricsheep.diff)
  xscreensaver/repos/extra-i686/xscreensaver.pam
    (from rev 164331, xscreensaver/trunk/xscreensaver.pam)
  xscreensaver/repos/extra-x86_64/LICENSE
    (from rev 164331, xscreensaver/trunk/LICENSE)
  xscreensaver/repos/extra-x86_64/PKGBUILD
    (from rev 164331, xscreensaver/trunk/PKGBUILD)
  xscreensaver/repos/extra-x86_64/add-electricsheep.diff
    (from rev 164331, xscreensaver/trunk/add-electricsheep.diff)
  xscreensaver/repos/extra-x86_64/xscreensaver.pam
    (from rev 164331, xscreensaver/trunk/xscreensaver.pam)
Deleted:
  xscreensaver/repos/extra-i686/LICENSE
  xscreensaver/repos/extra-i686/PKGBUILD
  xscreensaver/repos/extra-i686/add-electricsheep.diff
  xscreensaver/repos/extra-i686/xscreensaver-5.18-sonar-compile.patch
  xscreensaver/repos/extra-i686/xscreensaver.pam
  xscreensaver/repos/extra-x86_64/LICENSE
  xscreensaver/repos/extra-x86_64/PKGBUILD
  xscreensaver/repos/extra-x86_64/add-electricsheep.diff
  xscreensaver/repos/extra-x86_64/xscreensaver-5.18-sonar-compile.patch
  xscreensaver/repos/extra-x86_64/xscreensaver.pam

----------------------------------------------------+
 extra-i686/LICENSE                                 |   18 ++--
 extra-i686/PKGBUILD                                |   83 +++++++++----------
 extra-i686/add-electricsheep.diff                  |   24 ++---
 extra-i686/xscreensaver-5.18-sonar-compile.patch   |   12 --
 extra-i686/xscreensaver.pam                        |    2 
 extra-x86_64/LICENSE                               |   18 ++--
 extra-x86_64/PKGBUILD                              |   83 +++++++++----------
 extra-x86_64/add-electricsheep.diff                |   24 ++---
 extra-x86_64/xscreensaver-5.18-sonar-compile.patch |   12 --
 extra-x86_64/xscreensaver.pam                      |    2 
 10 files changed, 124 insertions(+), 154 deletions(-)

Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-i686/LICENSE	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,9 +0,0 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz at jwz.org>
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- */

Copied: xscreensaver/repos/extra-i686/LICENSE (from rev 164331, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1,9 @@
+/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz at jwz.org>
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-i686/PKGBUILD	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.18
-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' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-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
-        xscreensaver-5.18-sonar-compile.patch)
-sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134'
-          '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  patch -p1 -i "${srcdir}/xscreensaver-5.18-sonar-compile.patch"
-  ./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 \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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"
-}

Copied: xscreensaver/repos/extra-i686/PKGBUILD (from rev 164331, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.19
+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' 'mesa' 'xorg-appres' 'libxmu' \
+         'perl-libwww' 'perl-http-message')
+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=('16437d45f568ded8721a917e082f9b4d948954ec'
+          '677496218b81a42d90bee400026e94dd87fb8ffb'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/add-electricsheep.diff"
+  ./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 \
+    --without-gle --with-pixbuf --with-jpeg
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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: extra-i686/add-electricsheep.diff
===================================================================
--- extra-i686/add-electricsheep.diff	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-i686/add-electricsheep.diff	2012-07-30 21:28:55 UTC (rev 164332)
@@ -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
- 
- 
- 

Copied: xscreensaver/repos/extra-i686/add-electricsheep.diff (from rev 164331, xscreensaver/trunk/add-electricsheep.diff)
===================================================================
--- extra-i686/add-electricsheep.diff	                        (rev 0)
+++ extra-i686/add-electricsheep.diff	2012-07-30 21:28:55 UTC (rev 164332)
@@ -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 @@
+ @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
+ 
+ 
+ 

Deleted: extra-i686/xscreensaver-5.18-sonar-compile.patch
===================================================================
--- extra-i686/xscreensaver-5.18-sonar-compile.patch	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-i686/xscreensaver-5.18-sonar-compile.patch	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,12 +0,0 @@
---- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile	2012-07-03 04:18:53.000000000 +0900
-+++ xscreensaver-5.18/hacks/glx/sonar-icmp.c	2012-07-04 09:17:12.580996448 +0900
-@@ -591,7 +591,9 @@
-                 fprintf (stderr, "%s:     if: %4s: %s\n", progname,
-                          ifa->ifa_name,
-                          (ifa->ifa_addr->sa_family == AF_UNIX  ? "local" :
-+#ifdef AF_LINK
-                           ifa->ifa_addr->sa_family == AF_LINK  ? "link"  :
-+#endif
-                           ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6"  :
-                           "other"));
-               continue;

Deleted: extra-i686/xscreensaver.pam
===================================================================
--- extra-i686/xscreensaver.pam	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-i686/xscreensaver.pam	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so

Copied: xscreensaver/repos/extra-i686/xscreensaver.pam (from rev 164331, xscreensaver/trunk/xscreensaver.pam)
===================================================================
--- extra-i686/xscreensaver.pam	                        (rev 0)
+++ extra-i686/xscreensaver.pam	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1 @@
+auth		required	pam_unix_auth.so

Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-x86_64/LICENSE	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,9 +0,0 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz at jwz.org>
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- */

Copied: xscreensaver/repos/extra-x86_64/LICENSE (from rev 164331, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1,9 @@
+/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz at jwz.org>
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-x86_64/PKGBUILD	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.18
-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' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-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
-        xscreensaver-5.18-sonar-compile.patch)
-sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134'
-          '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  patch -p1 -i "${srcdir}/xscreensaver-5.18-sonar-compile.patch"
-  ./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 \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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"
-}

Copied: xscreensaver/repos/extra-x86_64/PKGBUILD (from rev 164331, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.19
+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' 'mesa' 'xorg-appres' 'libxmu' \
+         'perl-libwww' 'perl-http-message')
+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=('16437d45f568ded8721a917e082f9b4d948954ec'
+          '677496218b81a42d90bee400026e94dd87fb8ffb'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/add-electricsheep.diff"
+  ./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 \
+    --without-gle --with-pixbuf --with-jpeg
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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: extra-x86_64/add-electricsheep.diff
===================================================================
--- extra-x86_64/add-electricsheep.diff	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-x86_64/add-electricsheep.diff	2012-07-30 21:28:55 UTC (rev 164332)
@@ -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
- 
- 
- 

Copied: xscreensaver/repos/extra-x86_64/add-electricsheep.diff (from rev 164331, xscreensaver/trunk/add-electricsheep.diff)
===================================================================
--- extra-x86_64/add-electricsheep.diff	                        (rev 0)
+++ extra-x86_64/add-electricsheep.diff	2012-07-30 21:28:55 UTC (rev 164332)
@@ -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 @@
+ @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
+ 
+ 
+ 

Deleted: extra-x86_64/xscreensaver-5.18-sonar-compile.patch
===================================================================
--- extra-x86_64/xscreensaver-5.18-sonar-compile.patch	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-x86_64/xscreensaver-5.18-sonar-compile.patch	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1,12 +0,0 @@
---- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile	2012-07-03 04:18:53.000000000 +0900
-+++ xscreensaver-5.18/hacks/glx/sonar-icmp.c	2012-07-04 09:17:12.580996448 +0900
-@@ -591,7 +591,9 @@
-                 fprintf (stderr, "%s:     if: %4s: %s\n", progname,
-                          ifa->ifa_name,
-                          (ifa->ifa_addr->sa_family == AF_UNIX  ? "local" :
-+#ifdef AF_LINK
-                           ifa->ifa_addr->sa_family == AF_LINK  ? "link"  :
-+#endif
-                           ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6"  :
-                           "other"));
-               continue;

Deleted: extra-x86_64/xscreensaver.pam
===================================================================
--- extra-x86_64/xscreensaver.pam	2012-07-30 21:28:19 UTC (rev 164331)
+++ extra-x86_64/xscreensaver.pam	2012-07-30 21:28:55 UTC (rev 164332)
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so

Copied: xscreensaver/repos/extra-x86_64/xscreensaver.pam (from rev 164331, xscreensaver/trunk/xscreensaver.pam)
===================================================================
--- extra-x86_64/xscreensaver.pam	                        (rev 0)
+++ extra-x86_64/xscreensaver.pam	2012-07-30 21:28:55 UTC (rev 164332)
@@ -0,0 +1 @@
+auth		required	pam_unix_auth.so




More information about the arch-commits mailing list