[arch-commits] Commit in glib2/trunk (PKGBUILD revert-warn-glib-compile-schemas.patch)

[Ionut Biru]

    Date: Saturday, April 14, 2012 @ 13:16:38
  Author: ibiru
Revision: 156153

reduce the noise

Added:
  glib2/trunk/revert-warn-glib-compile-schemas.patch
Modified:
  glib2/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |    9 +++++---
 revert-warn-glib-compile-schemas.patch |   33 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-14 16:31:07 UTC (rev 156152)
+++ PKGBUILD	2012-04-14 17:16:38 UTC (rev 156153)
@@ -3,7 +3,7 @@
 
 pkgname=glib2
 pkgver=2.32.1
-pkgrel=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 @@
 options=('!libtool' '!docs' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         glib2.sh
-        glib2.csh)
+        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 \

Added: revert-warn-glib-compile-schemas.patch
===================================================================
--- revert-warn-glib-compile-schemas.patch	                        (rev 0)
+++ revert-warn-glib-compile-schemas.patch	2012-04-14 17:16:38 UTC (rev 156153)
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at 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