Date: Saturday, September 11, 2010 @ 16:06:07 Author: ibiru Revision: 90460
upgpkg: gconf 2.31.91-1 update to 2.31.91 Modified: gconf/trunk/PKGBUILD gconf/trunk/gconf.install ---------------+ PKGBUILD | 36 ++++++++++++++++++------------------ gconf.install | 14 +------------- 2 files changed, 19 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-11 19:58:06 UTC (rev 90459) +++ PKGBUILD 2010-09-11 20:06:07 UTC (rev 90460) @@ -2,41 +2,41 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=gconf -pkgver=2.28.1 +pkgver=2.31.91 pkgrel=1 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') -depends=('orbit2>=2.14.17' 'gtk2>=2.20.0' 'libxml2>=2.7.7' 'polkit>=0.96' 'libldap>=2.4.18' 'dbus') -makedepends=('pkgconfig' 'intltool' 'gtk-doc') +depends=('orbit2>=2.14.18' 'gtk2>=2.21.7' 'libxml2>=2.7.7' 'polkit>=0.96' 'libldap>=2.4.18' 'dbus') +makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') options=('!libtool') install=gconf.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.28/GConf-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.31/GConf-${pkgver}.tar.bz2 gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -md5sums=('27663faf0af4f6a6d534de9270f6d24a' - '240b473fa17b748fc9020caf372d936c' - 'b745f04b4121d8724c002b14a4c110b6' - 'cfcc8e15be7b8a48de4aa34336ff6090' - '1f9362976d71312bdb57c57fa031681d') +sha256sums=('e351ddf84a63dcc6c89e7c58d72071a00f78f2c5ea91f0e7bd4ba364ae319cdb' + 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' + 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' + '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' + 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') build() { cd "${srcdir}/GConf-${pkgver}" # Patch from fedora - reloads gconf after installing schemas - patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1 + patch -Np1 -i "${srcdir}/gconf-reload.patch" # http://bugzilla.gnome.org/show_bug.cgi?id=568845 - patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" || return 1 - + patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --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 - install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" || return 1 + --disable-static --enable-defaults-service + make pkglibdir=/usr/lib/GConf + 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/" || return 1 + install -m755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/" } Modified: gconf.install =================================================================== --- gconf.install 2010-09-11 19:58:06 UTC (rev 90459) +++ gconf.install 2010-09-11 20:06:07 UTC (rev 90460) @@ -5,20 +5,8 @@ post_upgrade() { ldconfig -r . - if [ `vercmp $2 2.18.0.1-2` -lt 0 ]; then - echo "Regenerating GConf database... " - # Move from /opt/gnome to /usr - ldconfig -r . - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - find /opt/gnome/{etc,share}/gconf/schemas -name "*.schemas" | xargs \ - usr/bin/gconftool-2 --makefile-install-rule > /dev/null - if [ -f opt/gnome/etc/gconf/panel-default-setup.entries ]; then - usr/bin/gconftool-2 --direct --load opt/gnome/etc/gconf/panel-default-setup.entries > /dev/null - fi - echo "done." - fi chmod 755 etc/gconf/gconf.xml.system - + PID=`pidof gconfd-2` if [ ! -z "${PID}" ]; then kill ${PID}