From d8b95199d0f85e9f8a7119a6034749ceaefc6f35 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 11 Nov 2010 22:36:57 +0000 Subject: xscreensaver: update to 5.12 --- abs/extra/xscreensaver/ChangeLog | 26 ++++++++++++++ abs/extra/xscreensaver/PKGBUILD | 49 +++++++++++++-------------- abs/extra/xscreensaver/add-electricsheep.diff | 12 +++++++ abs/extra/xscreensaver/xscreensavers | 5 ++- 4 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 abs/extra/xscreensaver/add-electricsheep.diff diff --git a/abs/extra/xscreensaver/ChangeLog b/abs/extra/xscreensaver/ChangeLog index f972cf0..ea08818 100644 --- a/abs/extra/xscreensaver/ChangeLog +++ b/abs/extra/xscreensaver/ChangeLog @@ -1,3 +1,29 @@ +2010-09-26 Eric Belanger + + * xscreensaver 5.12-1 + * Upstream update + * Added libxxf86vm depends + +2010-05-17 Eric Belanger + + * xscreensaver 5.11-1 + * Upstream update + +2009-10-17 Eric Belanger + + * xscreensaver 5.10-2 + * Added support for electricsheep (close FS#16400) + +2009-09-09 Eric Belanger + + * xscreensaver 5.10-1 + * Upstream update + +2009-09-03 Eric Belanger + + * xscreensaver 5.09-1 + * Upstream update + 2009-01-02 Eric Belanger * xscreensaver 5.08-1 diff --git a/abs/extra/xscreensaver/PKGBUILD b/abs/extra/xscreensaver/PKGBUILD index 2eb7b7c..d36806d 100644 --- a/abs/extra/xscreensaver/PKGBUILD +++ b/abs/extra/xscreensaver/PKGBUILD @@ -1,40 +1,39 @@ -# $Id: PKGBUILD 23065 2009-01-02 07:24:36Z eric $ +# $Id: PKGBUILD 91276 2010-09-26 05:59:32Z eric $ # Maintainer: Eric Belanger -# Contributor: Sean Middleditch pkgname=xscreensaver -pkgver=5.08 -pkgrel=6 +pkgver=5.12 +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=('libxxf86misc' 'libglade' 'mesa' 'pam' 'xorg-res-utils') +depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-res-utils') makedepends=('bc') -install=xscreensaver.install backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ - xscreensaver.pam LICENSE) -md5sums=('79dea708c915341f205e00318a699be9' '367a3538f54db71f108b34cfa31088ac'\ - '5e7f3f2a63d20a484742f5b4cb5d572c') -sha1sums=('4e6889d7171eaf18b856c484a87d5701787e5dc6' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '4209ea586b204fd1d81c382a0522c654f9fd9134') + add-electricsheep.diff xscreensaver.pam LICENSE) +md5sums=('0345c1acb9280729de05c5ca44b401e3' 'f82524626ed8a6832cd279e0548a9b46'\ + '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c') +sha1sums=('7252540b1b1853459a56453714c0974de26fa4c5' '65c2933380267475f2c4560bc22f4350393b00ce'\ + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -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 --without-motif \ - --with-gtk --without-gnome --with-xml --with-gl \ - --without-gle --with-xpm --with-pixbuf --with-jpeg \ - --with-fortune="/bin/cat /etc/LinHES-release" || return 1 - make || return 1 - make install_prefix=${pkgdir} install || return 1 - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - install -D -m644 ${srcdir}/xscreensaver.pam ${pkgdir}/etc/pam.d/xscreensaver || return 1 - chmod 755 ${pkgdir}/usr/bin/xscreensaver || return 1 - echo "NotShowIn=KDE;GNOME;" >> ${pkgdir}/usr/share/applications/xscreensaver-properties.desktop || return 1 + --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ + --with-pam --without-motif --with-gtk --with-gl \ + --without-gle --with-xpm --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" ls $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers } diff --git a/abs/extra/xscreensaver/add-electricsheep.diff b/abs/extra/xscreensaver/add-electricsheep.diff new file mode 100644 index 0000000..964de64 --- /dev/null +++ b/abs/extra/xscreensaver/add-electricsheep.diff @@ -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\ +-@GL_KLUDGE@ GL: rubikblocks -root \n ++@GL_KLUDGE@ GL: rubikblocks -root \n\ ++ electricsheep --root 1 \n + + + diff --git a/abs/extra/xscreensaver/xscreensavers b/abs/extra/xscreensaver/xscreensavers index 887bef9..af7a6ea 100644 --- a/abs/extra/xscreensaver/xscreensavers +++ b/abs/extra/xscreensaver/xscreensavers @@ -86,8 +86,6 @@ halftone halo helix hopalong -hyperball -hypercube hypertorus hypnowheel ifs @@ -97,7 +95,6 @@ interference intermomentary jigglypuff jigsaw -juggle juggler3d julia kaleidescope @@ -152,6 +149,7 @@ rocks rorschach rotzoomer rubik +rubikblocks sballs shadebobs sierpinski @@ -172,6 +170,7 @@ stonerview strange substrate superquadrics +surfaces swirl tangram thornbird -- cgit v0.12