diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
| commit | 33fcf0e7b95e530b849e59e90fdea4001e01283d (patch) | |
| tree | 5eab4f238207cce42c8351067ade9999df065a1f /extra/xscreensaver | |
| parent | 3b0910bf6527c3b761d9579b2ed37a9a42595fa3 (diff) | |
| parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/libopenraw/PKGBUILD
community/smalltalk/PKGBUILD
core/coreutils/PKGBUILD
core/libarchive/PKGBUILD
extra/dhcp/PKGBUILD
extra/gmime/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libreoffice/PKGBUILD
extra/lirc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sdl_image/PKGBUILD
extra/sdl_net/PKGBUILD
extra/sdl_ttf/PKGBUILD
extra/spamassassin/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/tumbler/PKGBUILD
extra/vim/PKGBUILD
extra/wipe/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
multilib/binutils-multilib/PKGBUILD
multilib/chuck/PKGBUILD
multilib/dev86/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sdl_ttf/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
multilib/q4wine/PKGBUILD
multilib/wine/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
Diffstat (limited to 'extra/xscreensaver')
| -rw-r--r-- | extra/xscreensaver/PKGBUILD | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD index 03236b2d9..9c38f0f45 100644 --- a/extra/xscreensaver/PKGBUILD +++ b/extra/xscreensaver/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 139172 2011-09-30 22:43:18Z eric $ +# $Id: PKGBUILD 146796 2012-01-18 14:05:21Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xscreensaver pkgver=5.15 -pkgrel=2 +pkgrel=3 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' 'perl-libwww') -makedepends=('bc') +depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ + 'perl-libwww' 'perl-http-message') +makedepends=('bc' 'libxpm' 'gdm') +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) @@ -20,10 +22,10 @@ sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/add-electricsheep.diff" + patch -p0 -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 --with-gl \ + --with-pam --with-login-manager --with-gtk --with-gl \ --without-gle --with-pixbuf --with-jpeg make } |