diff options
| author | root <root@rshg054.dnsready.net> | 2012-04-16 00:01:18 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-04-16 00:01:18 +0000 |
| commit | ea3d877b99c32e3a9e00ab220440d4518430e5bc (patch) | |
| tree | 8cf0d286f935fd9e00eb3854d971c165c749d7bf /testing/glib2 | |
| parent | f06b9295f0e60a0faa0d3231a0d0b3f2358d8459 (diff) | |
Mon Apr 16 00:01:18 UTC 2012
Diffstat (limited to 'testing/glib2')
| -rw-r--r-- | testing/glib2/PKGBUILD | 15 | ||||
| -rw-r--r-- | testing/glib2/revert-warn-glib-compile-schemas.patch | 33 |
2 files changed, 42 insertions, 6 deletions
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD index 9874e6dbd..be2697245 100644 --- a/testing/glib2/PKGBUILD +++ b/testing/glib2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155090 2012-04-01 11:32:36Z heftig $ +# $Id: PKGBUILD 156154 2012-04-14 17:18:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.32.0 -pkgrel=1 +pkgver=2.32.1 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) @@ -14,13 +14,16 @@ 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=('cde9d9f25ed648069c547e323897ad9379974e1f936b4477fa51bcf1bb261ae4' + glib2.csh + revert-warn-glib-compile-schemas.patch) +sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver + patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-pcre=system \ diff --git a/testing/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch new file mode 100644 index 000000000..75b05103c --- /dev/null +++ b/testing/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 |