diff options
| -rw-r--r-- | abs/core/glib2/PKGBUILD | 48 | ||||
| -rw-r--r-- | abs/core/glib2/revert-warn-glib-compile-schemas.patch | 33 |
2 files changed, 56 insertions, 25 deletions
diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index c3ec618..0b43721 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -1,27 +1,30 @@ -# $Id$ +# $Id: PKGBUILD 163895 2012-07-21 19:19:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.28.8 +pkgver=2.32.4 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) license=('LGPL') -depends=('pcre>=8.12') -makedepends=('pkgconfig' 'python2') -checkdepends=('pygobject' 'dbus-python') -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz +depends=('pcre' 'libffi') +makedepends=('pkg-config' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz glib2.sh - glib2.csh) -sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353' + glib2.csh + revert-warn-glib-compile-schemas.patch) +sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { - cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr \ + cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ --with-pcre=system \ --disable-fam @@ -29,20 +32,15 @@ build() { } package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install + cd glib-$pkgver + make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + install -d "$pkgdir/etc/profile.d" + install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/" + install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/" - for _i in "${pkgdir}/etc/bash_completion.d/"*; do - chmod -x "${_i}" + for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do + chmod -x "$_i" done -} - -check() { - cd "${srcdir}/glib-${pkgver}" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py - make -k check || true + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen } diff --git a/abs/core/glib2/revert-warn-glib-compile-schemas.patch b/abs/core/glib2/revert-warn-glib-compile-schemas.patch new file mode 100644 index 0000000..75b0510 --- /dev/null +++ b/abs/core/glib2/revert-warn-glib-compile-schemas.patch @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2 |