diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-01 09:26:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-01 09:26:02 -0300 |
| commit | 0a3fcfa45dd6a820799b111a8bac0830faf459e5 (patch) | |
| tree | ee0d56252a19caafe61e05716e1a0daf49402a3b /extra/gconf/PKGBUILD | |
| parent | cf1a5af5ed7c29ec510e4606473103cffe96c245 (diff) | |
| parent | 83a318800db22408628e60c9e1730578efcfee37 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/webfs/PKGBUILD
extra/gconf-editor/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/transmission/PKGBUILD
Diffstat (limited to 'extra/gconf/PKGBUILD')
| -rw-r--r-- | extra/gconf/PKGBUILD | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index a40f8e164..04dbecf47 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156770 2012-04-23 09:05:12Z ibiru $ +# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf pkgver=3.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -13,11 +13,17 @@ 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' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' @@ -25,6 +31,11 @@ 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" # http://bugzilla.gnome.org/show_bug.cgi?id=568845 |