diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /extra/xscreensaver | |
parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/xscreensaver')
-rw-r--r-- | extra/xscreensaver/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/xscreensaver/add-electricsheep.diff | 10 |
2 files changed, 12 insertions, 16 deletions
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD index ff9f3e5a4..03236b2d9 100644 --- a/extra/xscreensaver/PKGBUILD +++ b/extra/xscreensaver/PKGBUILD @@ -1,24 +1,20 @@ -# $Id: PKGBUILD 124565 2011-05-22 23:54:17Z eric $ +# $Id: PKGBUILD 139172 2011-09-30 22:43:18Z eric $ # Maintainer: Eric BĂ©langer <eric@archlinux.org> pkgname=xscreensaver -pkgver=5.14 -pkgrel=1 +pkgver=5.15 +pkgrel=2 pkgdesc="Screen saver and locker for the X Window System" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu') +depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' 'perl-libwww') makedepends=('bc') backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ add-electricsheep.diff xscreensaver.pam LICENSE) -md5sums=('7777f2a50d6797f9757b6e078a7bea83' - 'f82524626ed8a6832cd279e0548a9b46' - '367a3538f54db71f108b34cfa31088ac' - '5e7f3f2a63d20a484742f5b4cb5d572c') -sha1sums=('bfa37a9e7b2e93f54922191bb93dbc70c2f73772' - '65c2933380267475f2c4560bc22f4350393b00ce' +sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' + '677496218b81a42d90bee400026e94dd87fb8ffb' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134') @@ -28,7 +24,7 @@ build() { ./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 --with-gl \ - --without-gle --with-xpm --with-pixbuf --with-jpeg + --without-gle --with-pixbuf --with-jpeg make } diff --git a/extra/xscreensaver/add-electricsheep.diff b/extra/xscreensaver/add-electricsheep.diff index 964de649f..18b4dea97 100644 --- a/extra/xscreensaver/add-electricsheep.diff +++ b/extra/xscreensaver/add-electricsheep.diff @@ -1,11 +1,11 @@ --- 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\ + @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 |