[arch-commits] Commit in xscreensaver/repos (14 files)
Eric Bélanger
eric at archlinux.org
Tue Nov 18 18:59:19 UTC 2014
Date: Tuesday, November 18, 2014 @ 19:59:18
Author: eric
Revision: 226368
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xscreensaver/repos/extra-i686/LICENSE
(from rev 226367, xscreensaver/trunk/LICENSE)
xscreensaver/repos/extra-i686/PKGBUILD
(from rev 226367, xscreensaver/trunk/PKGBUILD)
xscreensaver/repos/extra-i686/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
(from rev 226367, xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
xscreensaver/repos/extra-i686/xscreensaver-add-electricsheep.diff
(from rev 226367, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
xscreensaver/repos/extra-x86_64/LICENSE
(from rev 226367, xscreensaver/trunk/LICENSE)
xscreensaver/repos/extra-x86_64/PKGBUILD
(from rev 226367, xscreensaver/trunk/PKGBUILD)
xscreensaver/repos/extra-x86_64/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch
(from rev 226367, xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
xscreensaver/repos/extra-x86_64/xscreensaver-add-electricsheep.diff
(from rev 226367, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
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 | 90 ++++++++++
/xscreensaver-add-electricsheep.diff | 20 ++
extra-i686/LICENSE | 10 -
extra-i686/PKGBUILD | 42 ----
extra-i686/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch | 36 ++++
extra-i686/xscreensaver-add-electricsheep.diff | 10 -
extra-x86_64/LICENSE | 10 -
extra-x86_64/PKGBUILD | 42 ----
extra-x86_64/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch | 36 ++++
extra-x86_64/xscreensaver-add-electricsheep.diff | 10 -
11 files changed, 202 insertions(+), 124 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-i686/LICENSE 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 226367, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-i686/PKGBUILD 2014-11-18 18:59:18 UTC (rev 226368)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.30
-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=('734e0861145ec67cb848348fc25ea29393dc4d95'
- '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 226367, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-11-18 18:59:18 UTC (rev 226368)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.31
+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
+ xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
+sha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6'
+ 'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+ '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
+ '5a91e707f6482a3349609e8016b7668e3cd53161')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+ patch -p1 -i "${srcdir}/xscreensaver-5.31-1001-binaryring.c-include-stdint.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"
+}
Copied: xscreensaver/repos/extra-i686/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch (from rev 226367, xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
===================================================================
--- extra-i686/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch (rev 0)
+++ extra-i686/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch 2014-11-18 18:59:18 UTC (rev 226368)
@@ -0,0 +1,36 @@
+From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Sun, 16 Nov 2014 16:55:48 +0900
+Subject: [PATCH] binaryring.c: include stdint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On Fedora 21, binaryring.c fails to compile as:
+
+../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’
+ typedef uint32_t pixel_t;
+ ^
+Makefile:542: recipe for target 'binaryring.o' failed
+
+Just include stdint.h for this type.
+---
+ hacks/binaryring.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hacks/binaryring.c b/hacks/binaryring.c
+index 2432073..e3a58d9 100644
+--- a/hacks/binaryring.c
++++ b/hacks/binaryring.c
+@@ -27,6 +27,8 @@
+ #include "colors.h"
+ #include "hsv.h"
+
++#include <stdint.h>
++
+ #define ANTIALIAS 1
+ #define BLACK 0
+ #define WHITE 1
+--
+2.1.0
+
Deleted: extra-i686/xscreensaver-add-electricsheep.diff
===================================================================
--- extra-i686/xscreensaver-add-electricsheep.diff 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-i686/xscreensaver-add-electricsheep.diff 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 226367, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
===================================================================
--- extra-i686/xscreensaver-add-electricsheep.diff (rev 0)
+++ extra-i686/xscreensaver-add-electricsheep.diff 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-x86_64/LICENSE 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 226367, xscreensaver/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-x86_64/PKGBUILD 2014-11-18 18:59:18 UTC (rev 226368)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.30
-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=('734e0861145ec67cb848348fc25ea29393dc4d95'
- '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 226367, xscreensaver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-11-18 18:59:18 UTC (rev 226368)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xscreensaver
+pkgver=5.31
+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
+ xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
+sha1sums=('1b023a3b01f1f23aa136d13c37f79c0c01c3f1e6'
+ 'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+ '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
+ '5a91e707f6482a3349609e8016b7668e3cd53161')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+ patch -p1 -i "${srcdir}/xscreensaver-5.31-1001-binaryring.c-include-stdint.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"
+}
Copied: xscreensaver/repos/extra-x86_64/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch (from rev 226367, xscreensaver/trunk/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch)
===================================================================
--- extra-x86_64/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch (rev 0)
+++ extra-x86_64/xscreensaver-5.31-1001-binaryring.c-include-stdint.patch 2014-11-18 18:59:18 UTC (rev 226368)
@@ -0,0 +1,36 @@
+From 3b9f847b4692d34f966af368a63d03887be11a79 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Sun, 16 Nov 2014 16:55:48 +0900
+Subject: [PATCH] binaryring.c: include stdint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On Fedora 21, binaryring.c fails to compile as:
+
+../../hacks/binaryring.c:40:9: error: unknown type name ‘uint32_t’
+ typedef uint32_t pixel_t;
+ ^
+Makefile:542: recipe for target 'binaryring.o' failed
+
+Just include stdint.h for this type.
+---
+ hacks/binaryring.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hacks/binaryring.c b/hacks/binaryring.c
+index 2432073..e3a58d9 100644
+--- a/hacks/binaryring.c
++++ b/hacks/binaryring.c
+@@ -27,6 +27,8 @@
+ #include "colors.h"
+ #include "hsv.h"
+
++#include <stdint.h>
++
+ #define ANTIALIAS 1
+ #define BLACK 0
+ #define WHITE 1
+--
+2.1.0
+
Deleted: extra-x86_64/xscreensaver-add-electricsheep.diff
===================================================================
--- extra-x86_64/xscreensaver-add-electricsheep.diff 2014-11-18 18:55:57 UTC (rev 226367)
+++ extra-x86_64/xscreensaver-add-electricsheep.diff 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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 226367, xscreensaver/trunk/xscreensaver-add-electricsheep.diff)
===================================================================
--- extra-x86_64/xscreensaver-add-electricsheep.diff (rev 0)
+++ extra-x86_64/xscreensaver-add-electricsheep.diff 2014-11-18 18:59:18 UTC (rev 226368)
@@ -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\
More information about the arch-commits
mailing list