From cbacd41ea2887797d3a9c356afd330d5d65fe396 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 16 Dec 2014 20:34:55 +0000
Subject: xscreensaver: update to 5.32. closes #983
---
abs/extra/xscreensaver/ChangeLog | 46 ----------------------
abs/extra/xscreensaver/LICENSE | 3 +-
abs/extra/xscreensaver/PKGBUILD | 41 ++++++++++---------
abs/extra/xscreensaver/__changelog | 4 +-
abs/extra/xscreensaver/add-electricsheep.diff | 12 ------
.../xscreensaver-5.18-sonar-compile.patch | 12 ------
.../xscreensaver-add-electricsheep.diff | 10 +++++
abs/extra/xscreensaver/xscreensaver.pam | 1 -
abs/extra/xscreensaver/xscreensavers | 11 ++++++
9 files changed, 45 insertions(+), 95 deletions(-)
delete mode 100644 abs/extra/xscreensaver/ChangeLog
delete mode 100644 abs/extra/xscreensaver/add-electricsheep.diff
delete mode 100644 abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch
create mode 100644 abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff
delete mode 100644 abs/extra/xscreensaver/xscreensaver.pam
diff --git a/abs/extra/xscreensaver/ChangeLog b/abs/extra/xscreensaver/ChangeLog
deleted file mode 100644
index ea08818..0000000
--- a/abs/extra/xscreensaver/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-2010-09-26 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.12-1
- * Upstream update
- * Added libxxf86vm depends
-
-2010-05-17 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.11-1
- * Upstream update
-
-2009-10-17 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.10-2
- * Added support for electricsheep (close FS#16400)
-
-2009-09-09 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.10-1
- * Upstream update
-
-2009-09-03 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.09-1
- * Upstream update
-
-2009-01-02 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.08-1
- * Upstream update
-
-2008-08-11 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.07-1
- * Upstream update
-
-2008-07-18 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.06-1
- * Upstream update
-
-2008-03-02 Eric Belanger <eric@archlinux.org>
-
- * xscreensaver 5.05-1
- * Upstream update
- * FHS man pages
diff --git a/abs/extra/xscreensaver/LICENSE b/abs/extra/xscreensaver/LICENSE
index 4f587b5..406467c 100644
--- a/abs/extra/xscreensaver/LICENSE
+++ b/abs/extra/xscreensaver/LICENSE
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2013 Jamie Zawinski <jwz@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
diff --git a/abs/extra/xscreensaver/PKGBUILD b/abs/extra/xscreensaver/PKGBUILD
index 9393774..abdddd0 100644
--- a/abs/extra/xscreensaver/PKGBUILD
+++ b/abs/extra/xscreensaver/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 163563 2012-07-16 01:29:27Z eric $
+# $Id$
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=xscreensaver
-pkgver=5.18
-pkgrel=3
+pkgver=5.32
+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' )
-optdepends=('gdm: for login manager support')
+depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'intltool' 'libxpm')
+#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')
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
+ xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('3131d45295b9a18a2901737c9b95f1c5434f53a6'
+ 'e8dc57b6471fb3867ee099304ac6bf628351cb98'
+ '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i "${srcdir}/add-electricsheep.diff"
- patch -p1 -i "${srcdir}/xscreensaver-5.18-sonar-compile.patch"
+ 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 \
@@ -34,11 +33,11 @@ build() {
}
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"
- ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
+ ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
}
diff --git a/abs/extra/xscreensaver/__changelog b/abs/extra/xscreensaver/__changelog
index ca14a40..317fa78 100644
--- a/abs/extra/xscreensaver/__changelog
+++ b/abs/extra/xscreensaver/__changelog
@@ -1,3 +1,3 @@
-print out list of screensavers to xscreensaver
- ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
+PKGBUILD: print out list of screensavers to xscreensavers
+ ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
diff --git a/abs/extra/xscreensaver/add-electricsheep.diff b/abs/extra/xscreensaver/add-electricsheep.diff
deleted file mode 100644
index 18b4dea..0000000
--- a/abs/extra/xscreensaver/add-electricsheep.diff
+++ /dev/null
@@ -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\
--@GL_KLUDGE@ GL: tronbit -root \n
-+@GL_KLUDGE@ GL: tronbit -root \n\
-+ electricsheep --root 1 \n
-
-
-
diff --git a/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch b/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch
deleted file mode 100644
index e0adde0..0000000
--- a/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch
+++ /dev/null
@@ -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;
diff --git a/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff b/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff
new file mode 100644
index 0000000..0c5c3ff
--- /dev/null
+++ b/abs/extra/xscreensaver/xscreensaver-add-electricsheep.diff
@@ -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\
diff --git a/abs/extra/xscreensaver/xscreensaver.pam b/abs/extra/xscreensaver/xscreensaver.pam
deleted file mode 100644
index b4d80c2..0000000
--- a/abs/extra/xscreensaver/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
diff --git a/abs/extra/xscreensaver/xscreensavers b/abs/extra/xscreensaver/xscreensavers
index b3d17e0..46e7c93 100644
--- a/abs/extra/xscreensaver/xscreensavers
+++ b/abs/extra/xscreensaver/xscreensavers
@@ -10,6 +10,7 @@ atlantis
attraction
atunnel
barcode
+binaryring
blaster
blinkbox
blitspin
@@ -28,6 +29,7 @@ carousel
ccurve
celtic
circuit
+cityflow
cloudlife
companioncube
compass
@@ -68,6 +70,8 @@ fontglide
fuzzyflakes
galaxy
gears
+geodesic
+geodesicgears
gflux
glblur
glcells
@@ -86,6 +90,7 @@ greynetic
halftone
halo
helix
+hexadrop
hilbert
hopalong
hypertorus
@@ -100,6 +105,7 @@ jigsaw
juggler3d
julia
kaleidescope
+kaleidocycle
klein
kumppa
lament
@@ -140,10 +146,12 @@ polyominoes
polytopes
pong
popsquares
+projectiveplane
providence
pulsar
pyro
qix
+quasicrystal
queens
rd-bomb
ripples
@@ -175,6 +183,7 @@ superquadrics
surfaces
swirl
tangram
+tessellimage
thornbird
timetunnel
topblock
@@ -182,6 +191,7 @@ triangle
tronbit
truchet
twang
+unknownpleasures
vermiculate
vidwhacker
voronoi
@@ -189,6 +199,7 @@ wander
webcollage
webcollage-helper
whirlwindwarp
+winduprobot
wormhole
xanalogtv
xflame
--
cgit v0.12