[arch-commits] Commit in gnome-screensaver/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 16:31:09
  Author: jgc
Revision: 54947

Merged revisions 36272,54945 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-screensaver/trunk

........
  r36272 | jgc | 2009-04-20 23:14:19 +0200 (Mon, 20 Apr 2009) | 1 line
  
  upgpkg: gnome-screensaver 2.26.1-1
........
  r54945 | jgc | 2009-10-11 22:30:22 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  gnome-screensaver/repos/extra-i686/	(properties)
  gnome-screensaver/repos/extra-i686/PKGBUILD
Deleted:
  gnome-screensaver/repos/extra-i686/bug564548.patch

-----------------+
 PKGBUILD        |   29 ++++++++++++++++-------------
 bug564548.patch |   13 -------------
 2 files changed, 16 insertions(+), 26 deletions(-)


Property changes on: gnome-screensaver/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-screensaver/trunk:1-36219
   + /gnome-screensaver/trunk:1-54946

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-11 20:30:48 UTC (rev 54946)
+++ extra-i686/PKGBUILD	2009-10-11 20:31:09 UTC (rev 54947)
@@ -2,39 +2,42 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.26.1
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.26.1' 'libgnomekbd>=2.26.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.26.1' 'libxxf86misc')
-makedepends=('pkgconfig' 'gettext' 'intltool' 'mesa' 'xscreensaver')
+depends=('gnome-menus>=2.28.0' 'libgnomekbd>=2.28.0' 'libgl' 'libnotify>=0.4.5' 'gnome-desktop>=2.28.0' 'libxxf86misc')
+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.26/${pkgname}-${pkgver}.tar.bz2
-	gnome-screensaver.pam)
-md5sums=('13b9066bb2dfe9face50b3d852b67ded'
-         '4b4d2672a787e0d2ed792b4c308ccf8d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+	      gnome-screensaver.pam)
+sha256sums=('4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412'
+            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./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 || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
   install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" || return 1
 
   #Migrate xscreensaver configuration files
+  sed -e 's|Exec=|Exec=/usr/lib/xscreensaver/|' \
+      -i data/xscreensaver-config.xsl || return 1
   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 || return 1
   
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-screensaver ${pkgdir}/etc/gconf/schemas/*.schemas || return 1

Deleted: extra-i686/bug564548.patch
===================================================================
--- extra-i686/bug564548.patch	2009-10-11 20:30:48 UTC (rev 54946)
+++ extra-i686/bug564548.patch	2009-10-11 20:31:09 UTC (rev 54947)
@@ -1,13 +0,0 @@
---- trunk/src/gs-window-x11.c	2008/05/29 17:03:19	1452
-+++ trunk/src/gs-window-x11.c	2008/12/15 15:19:36	1571
-@@ -2287,6 +2287,10 @@
- 
-         gs_window_dialog_finish (window);
- 
-+        if (window->priv->background_pixmap) {
-+               g_object_unref (window->priv->background_pixmap);
-+        }
-+
-         G_OBJECT_CLASS (gs_window_parent_class)->finalize (object);
- }
-