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

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 15:34:00
  Author: jgc
Revision: 54800

Merged revisions 54797 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gconf/trunk

........
  r54797 | jgc | 2009-10-11 21:33:14 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  gconf/repos/extra-i686/	(properties)
  gconf/repos/extra-i686/PKGBUILD
Deleted:
  gconf/repos/extra-i686/05_from_vuntz_gconf2-pk-default-path.patch

--------------------------------------------+
 05_from_vuntz_gconf2-pk-default-path.patch |   12 ---------
 PKGBUILD                                   |   35 ++++++++++-----------------
 2 files changed, 14 insertions(+), 33 deletions(-)


Property changes on: gconf/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gconf/trunk:1-52283
   + /gconf/trunk:1-54798

Deleted: extra-i686/05_from_vuntz_gconf2-pk-default-path.patch
===================================================================
--- extra-i686/05_from_vuntz_gconf2-pk-default-path.patch	2009-10-11 19:33:49 UTC (rev 54799)
+++ extra-i686/05_from_vuntz_gconf2-pk-default-path.patch	2009-10-11 19:34:00 UTC (rev 54800)
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gconf-2.25.2/defaults/gconf-defaults.c gconf-2.25.2.new/defaults/gconf-defaults.c
---- gconf-2.25.2/defaults/gconf-defaults.c	2009-02-17 01:15:19.000000000 +0100
-+++ gconf-2.25.2.new/defaults/gconf-defaults.c	2009-02-17 11:12:39.000000000 +0100
-@@ -507,7 +507,7 @@
- 	else {
- 		annotation_key = "org.gnome.gconf.defaults.set-system.prefix"; 
- 		default_action = "org.gnome.gconf.defaults.set-system";
--		dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
-+		dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
- 	}
- 
- 	for (i = 0; includes[i]; i++) {

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-11 19:33:49 UTC (rev 54799)
+++ extra-i686/PKGBUILD	2009-10-11 19:34:00 UTC (rev 54800)
@@ -2,28 +2,26 @@
 # Maintainer:  Jan de Groot <jan at archlinux.org>
 
 pkgname=gconf
-pkgver=2.26.2
-pkgrel=3
+pkgver=2.28.0
+pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('orbit2>=2.14.17' 'gtk2>=2.16.1' 'libxml2>=2.7.3' 'policykit>=0.9' 'libldap>=2.4.18')
-makedepends=('pkgconfig' 'intltool>=0.40.6' 'gtk-doc>=1.10')
+depends=('orbit2>=2.14.17' 'gtk2>=2.17.11' 'libxml2>=2.7.3' 'polkit>=0.94' 'libldap>=2.4.18' 'dbus')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
 options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.26/GConf-${pkgver}.tar.bz2
-	gconf-merge-schema
-	gconfpkg
-	gconf-reload.patch
-	01_xml-gettext-domain.patch
-	05_from_vuntz_gconf2-pk-default-path.patch)
-md5sums=('8b55d58dab13e821e048627aa4f92b8b'
+source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.28/GConf-${pkgver}.tar.bz2
+        gconf-merge-schema
+        gconfpkg
+        gconf-reload.patch
+        01_xml-gettext-domain.patch)
+md5sums=('ad2aeb9c7d906b274954c51a615caeac'
          '240b473fa17b748fc9020caf372d936c'
          'b745f04b4121d8724c002b14a4c110b6'
          'cfcc8e15be7b8a48de4aa34336ff6090'
-         '1f9362976d71312bdb57c57fa031681d'
-         'd9a02aee25ec04f2340f4e98963aabb0')
+         '1f9362976d71312bdb57c57fa031681d')
 
 build() {
   cd "${srcdir}/GConf-${pkgver}"
@@ -31,15 +29,10 @@
   patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1
   # http://bugzilla.gnome.org/show_bug.cgi?id=568845
   patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" || return 1
-  # Patch from Ubuntu: change default path
-  patch -Np1 -i "${srcdir}/05_from_vuntz_gconf2-pk-default-path.patch" || return 1
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake --add-missing || return 1
+   
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --libexecdir=/usr/lib/GConf \
-	      --disable-static --enable-defaults-service || return 1
+      --localstatedir=/var --libexecdir=/usr/lib/GConf \
+      --disable-static --enable-defaults-service || return 1
   make pkglibdir=/usr/lib/GConf || return 1
   make DESTDIR="${pkgdir}" install || return 1
   install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" || return 1