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

Eric Bélanger eric at archlinux.org
Wed Jul 22 01:59:38 UTC 2015


    Date: Wednesday, July 22, 2015 @ 03:59:38
  Author: eric
Revision: 242412

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

Added:
  xscreensaver/repos/extra-i686/LICENSE
    (from rev 242411, xscreensaver/trunk/LICENSE)
  xscreensaver/repos/extra-i686/PKGBUILD
    (from rev 242411, xscreensaver/trunk/PKGBUILD)
  xscreensaver/repos/extra-i686/xscreensaver-add-electricsheep.diff
    (from rev 242411, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
  xscreensaver/repos/extra-i686/xscreensaver-missingescape.patch
    (from rev 242411, xscreensaver/trunk/xscreensaver-missingescape.patch)
  xscreensaver/repos/extra-x86_64/LICENSE
    (from rev 242411, xscreensaver/trunk/LICENSE)
  xscreensaver/repos/extra-x86_64/PKGBUILD
    (from rev 242411, xscreensaver/trunk/PKGBUILD)
  xscreensaver/repos/extra-x86_64/xscreensaver-add-electricsheep.diff
    (from rev 242411, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
  xscreensaver/repos/extra-x86_64/xscreensaver-missingescape.patch
    (from rev 242411, xscreensaver/trunk/xscreensaver-missingescape.patch)
Deleted:
  xscreensaver/repos/extra-i686/LICENSE
  xscreensaver/repos/extra-i686/PKGBUILD
  xscreensaver/repos/extra-i686/xscreensaver-add-electricsheep.diff
  xscreensaver/repos/extra-x86_64/LICENSE
  xscreensaver/repos/extra-x86_64/PKGBUILD
  xscreensaver/repos/extra-x86_64/xscreensaver-add-electricsheep.diff

--------------------------------------------------+
 /LICENSE                                         |   20 ++++
 /PKGBUILD                                        |   92 +++++++++++++++++++++
 /xscreensaver-add-electricsheep.diff             |   20 ++++
 extra-i686/LICENSE                               |   10 --
 extra-i686/PKGBUILD                              |   42 ---------
 extra-i686/xscreensaver-add-electricsheep.diff   |   10 --
 extra-i686/xscreensaver-missingescape.patch      |   12 ++
 extra-x86_64/LICENSE                             |   10 --
 extra-x86_64/PKGBUILD                            |   42 ---------
 extra-x86_64/xscreensaver-add-electricsheep.diff |   10 --
 extra-x86_64/xscreensaver-missingescape.patch    |   12 ++
 11 files changed, 156 insertions(+), 124 deletions(-)

Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-i686/LICENSE	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,10 +0,0 @@
-/* xscreensaver, Copyright (c) 1991-2013 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 242411, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2015-07-22 01:59:38 UTC (rev 242412)
@@ -0,0 +1,10 @@
+/* xscreensaver, Copyright (c) 1991-2013 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	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-i686/PKGBUILD	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.33
-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=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
-makedepends=('bc' 'intltool' 'libxpm' 'gdm')
-optdepends=('gdm: for login manager support')
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-        xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
-          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-}
-
-build() {
-  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 \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-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"
-  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 242411, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-07-22 01:59:38 UTC (rev 242412)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.33
+pkgrel=2
+pkgdesc="Screen saver and locker for the X Window System"
+arch=('i686' 'x86_64')
+url="http://www.jwz.org/xscreensaver/"
+license=('BSD')
+depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'intltool' 'libxpm' 'gdm')
+optdepends=('gdm: for login manager support')
+backup=('etc/pam.d/xscreensaver')
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
+        xscreensaver-add-electricsheep.diff
+	xscreensaver-missingescape.patch
+	LICENSE)
+sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
+          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+          'ab2962f497e0b50a2ffe135baefdc155b0be1413'
+          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+  patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
+}
+
+build() {
+  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 \
+    --without-gle --with-pixbuf --with-jpeg
+  make
+}
+
+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"
+  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
+  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
+}

Deleted: extra-i686/xscreensaver-add-electricsheep.diff
===================================================================
--- extra-i686/xscreensaver-add-electricsheep.diff	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-i686/xscreensaver-add-electricsheep.diff	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,10 +0,0 @@
---- 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\

Copied: xscreensaver/repos/extra-i686/xscreensaver-add-electricsheep.diff (from rev 242411, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
===================================================================
--- extra-i686/xscreensaver-add-electricsheep.diff	                        (rev 0)
+++ extra-i686/xscreensaver-add-electricsheep.diff	2015-07-22 01:59:38 UTC (rev 242412)
@@ -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\

Copied: xscreensaver/repos/extra-i686/xscreensaver-missingescape.patch (from rev 242411, xscreensaver/trunk/xscreensaver-missingescape.patch)
===================================================================
--- extra-i686/xscreensaver-missingescape.patch	                        (rev 0)
+++ extra-i686/xscreensaver-missingescape.patch	2015-07-22 01:59:38 UTC (rev 242412)
@@ -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)
+ 

Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-x86_64/LICENSE	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,10 +0,0 @@
-/* xscreensaver, Copyright (c) 1991-2013 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 242411, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2015-07-22 01:59:38 UTC (rev 242412)
@@ -0,0 +1,10 @@
+/* xscreensaver, Copyright (c) 1991-2013 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	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-x86_64/PKGBUILD	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.33
-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=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
-makedepends=('bc' 'intltool' 'libxpm' 'gdm')
-optdepends=('gdm: for login manager support')
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
-        xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
-          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
-}
-
-build() {
-  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 \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-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"
-  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 242411, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-07-22 01:59:38 UTC (rev 242412)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.33
+pkgrel=2
+pkgdesc="Screen saver and locker for the X Window System"
+arch=('i686' 'x86_64')
+url="http://www.jwz.org/xscreensaver/"
+license=('BSD')
+depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'intltool' 'libxpm' 'gdm')
+optdepends=('gdm: for login manager support')
+backup=('etc/pam.d/xscreensaver')
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
+        xscreensaver-add-electricsheep.diff
+	xscreensaver-missingescape.patch
+	LICENSE)
+sha1sums=('99f69ff0bef5e13ab0c84dcb1312605db485bafd'
+          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+          'ab2962f497e0b50a2ffe135baefdc155b0be1413'
+          '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+  patch -p1 -i "${srcdir}/xscreensaver-missingescape.patch"
+}
+
+build() {
+  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 \
+    --without-gle --with-pixbuf --with-jpeg
+  make
+}
+
+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"
+  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
+  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
+}

Deleted: extra-x86_64/xscreensaver-add-electricsheep.diff
===================================================================
--- extra-x86_64/xscreensaver-add-electricsheep.diff	2015-07-22 01:56:20 UTC (rev 242411)
+++ extra-x86_64/xscreensaver-add-electricsheep.diff	2015-07-22 01:59:38 UTC (rev 242412)
@@ -1,10 +0,0 @@
---- 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\

Copied: xscreensaver/repos/extra-x86_64/xscreensaver-add-electricsheep.diff (from rev 242411, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
===================================================================
--- extra-x86_64/xscreensaver-add-electricsheep.diff	                        (rev 0)
+++ extra-x86_64/xscreensaver-add-electricsheep.diff	2015-07-22 01:59:38 UTC (rev 242412)
@@ -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\

Copied: xscreensaver/repos/extra-x86_64/xscreensaver-missingescape.patch (from rev 242411, xscreensaver/trunk/xscreensaver-missingescape.patch)
===================================================================
--- extra-x86_64/xscreensaver-missingescape.patch	                        (rev 0)
+++ extra-x86_64/xscreensaver-missingescape.patch	2015-07-22 01:59:38 UTC (rev 242412)
@@ -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)
+ 



More information about the arch-commits mailing list