From 3ff20dedff636571ad0faa4736af5b23e4623ffe Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Mar 2013 00:05:24 -0700 Subject: Thu Mar 14 00:05:23 PDT 2013 --- extra/gconf/PKGBUILD | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'extra/gconf/PKGBUILD') diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index 31e7a370f..dfd2e82fd 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $ +# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $ # Maintainer: Jan de Groot pkgname=gconf -pkgver=3.2.5 -pkgrel=3 +pkgver=3.2.6 +pkgrel=1 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') @@ -13,17 +13,11 @@ options=('!libtool') install=gconf.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz - gconf-dbus-fix-use-after-free.patch - gconf-dbus-fix-shutdown.patch - gsettings-schema-convert-dont-fail.patch gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' - '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d' - 'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2' - 'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19' +sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' @@ -31,10 +25,6 @@ sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' build() { cd "GConf-$pkgver" - # Upstream fixes from git - patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch" - patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch" - patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch" # Patch from fedora - reloads gconf after installing schemas patch -Np1 -i "$srcdir/gconf-reload.patch" -- cgit v1.2.3-54-g00ecf