[arch-commits] Commit in gconf/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, February 11, 2011 @ 12:28:00
  Author: heftig
Revision: 109653

upgpkg: gconf 2.32.1-1
bump to 2.32.1, use gtk3

Modified:
  gconf/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-02-11 17:15:17 UTC (rev 109652)
+++ PKGBUILD    2011-02-11 17:28:00 UTC (rev 109653)
@@ -2,12 +2,13 @@
 # Maintainer:  Jan de Groot <j...@archlinux.org>
 
 pkgname=gconf
-pkgver=2.32.0
+pkgver=2.32.1
 pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('orbit2>=2.14.18' 'gtk2>=2.22.0' 'libxml2>=2.7.7' 'polkit>=0.98' 
'libldap>=2.4.23' 'dbus-glib>=0.86')
+depends=('orbit2>=2.14.18' 'libxml2>=2.7.7' 'polkit>=0.98' 'libldap>=2.4.23'
+         'dbus-glib>=0.86' 'gtk3>=3.0.0')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gconf.install
@@ -17,7 +18,7 @@
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0'
+sha256sums=('f2d06c1ab52ac54e9f025e9bdeb08460f27a7fe6f9e660aa39d9f059dafecd18'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
@@ -30,13 +31,21 @@
   # http://bugzilla.gnome.org/show_bug.cgi?id=568845
   patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch"
 
+  # Python2 fix
+  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service
+      --disable-static --enable-defaults-service --with-gtk=3.0
+
   make pkglibdir=/usr/lib/GConf
+}
+
+package() {
+  cd "${srcdir}/GConf-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
   install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system"
   install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/"
-  install -d -m755 "${pkgdir}/usr/sbin"
-  install -m755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/"
+  install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg"
 }