gnome-screensaver: upgrade

2 files changed, 33 insertions, 28 deletions

diff --git a/abs/extra/gnome-screensaver/PKGBUILD b/abs/extra/gnome-screensaver/PKGBUILD
index cdd4e0b..d78f92d 100644
--- a/abs/extra/gnome-screensaver/PKGBUILD
+++ b/abs/extra/gnome-screensaver/PKGBUILD
@@ -1,47 +1,53 @@
-# $Id: PKGBUILD 29213 2009-03-06 18:47:56Z jgc $
+# $Id: PKGBUILD 92371 2010-09-29 14:03:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.24.1
-pkgrel=7
+pkgver=2.30.2
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.24.2' 'libgnomekbd>=2.24.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.24.2' 'libxxf86misc')
-makedepends=('pkgconfig' 'gettext' 'intltool' 'mesa' 'xscreensaver' 'libxslt')
+depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.4.5' 'gnome-desktop>=2.32.0')
+makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt')
+optdepends=('xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	gnome-screensaver.pam
-	bug564548.patch)
-md5sums=('f0b9cc3108bb9105141a8c22b56bf615'
-         '4b4d2672a787e0d2ed792b4c308ccf8d'
-	 'b2accd56fd1e7e3855c1cee3cc3780c4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+	      gnome-screensaver.pam)
+sha256sums=('dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa'
+            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/bug564548.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/gnome-screensaver \
-              --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
-	      --with-xscreensaverdir=/usr/share/xscreensaver/config \
-	      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
-	      --with-dpms-ext || return 1
+      --libexecdir=/usr/lib/gnome-screensaver \
+      --localstatedir=/var \
+      --with-xscreensaverdir=/usr/share/xscreensaver/config \
+      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
+      --with-mit-ext
+
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+}
 
-  install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
 
   #Migrate xscreensaver configuration files
+  sed -e 's|Exec=|Exec=/usr/lib/xscreensaver/|' \
+      -i data/xscreensaver-config.xsl
   cd "${pkgdir}/usr/share/applications/screensavers"
-  "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" /usr/share/xscreensaver/config/*.xml || return 1
-  
+  "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" \
+      /usr/share/xscreensaver/config/*.xml
+
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-screensaver ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-  ls $pkgdir/usr/share/applications/screensavers/|cut -d. -f1 > $startdir/gscreensavers
-
+  ls ${pkgdir}/usr/share/applications/screensavers/|cut -d. -f1 > ${startdir}/gscreensavers
 }
diff --git a/abs/extra/gnome-screensaver/gscreensavers b/abs/extra/gnome-screensaver/gscreensavers
index 7f56072..39500bf 100644
--- a/abs/extra/gnome-screensaver/gscreensavers
+++ b/abs/extra/gnome-screensaver/gscreensavers
@@ -89,8 +89,6 @@ halftone
 halo
 helix
 hopalong
-hyperball
-hypercube
 hypertorus
 hypnowheel
 ifs
@@ -100,7 +98,6 @@ interference
 intermomentary
 jigglypuff
 jigsaw
-juggle
 juggler3d
 julia
 kaleidescope
@@ -155,6 +152,7 @@ rocks
 rorschach
 rotzoomer
 rubik
+rubikblocks
 sballs
 shadebobs
 sierpinski
@@ -175,6 +173,7 @@ stonerview
 strange
 substrate
 superquadrics
+surfaces
 swirl
 tangram
 thornbird