[arch-commits] Commit in lib32-glib2/trunk (2 files)

[Maxime Gauduin]

    Date: Wednesday, October 1, 2014 @ 22:45:51
  Author: alucryd
Revision: 119986

upgpkg: lib32-glib2 2.42.0-1

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

----------------------------------------+
 PKGBUILD                               |   23 ++++++++++++++-------
 revert-warn-glib-compile-schemas.patch |   33 +++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 20:33:03 UTC (rev 119985)
+++ PKGBUILD	2014-10-01 20:45:51 UTC (rev 119986)
@@ -5,18 +5,25 @@
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.40.0
+pkgver=2.42.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
 license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-libdbus' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz)
-sha256sums=('0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5')
+depends=('lib32-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename")
+makedepends=('gcc-multilib' 'python2')
+options=('!docs')
+source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
+        'revert-warn-glib-compile-schemas.patch')
+sha256sums=('94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
+prepare() {
+  cd "${srcdir}/glib-${pkgver}"
+  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+}
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -23,8 +30,8 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --libdir=/usr/lib32 --with-pcre=system --disable-fam
   make
 }
 

Added: revert-warn-glib-compile-schemas.patch
===================================================================
--- revert-warn-glib-compile-schemas.patch	                        (rev 0)
+++ revert-warn-glib-compile-schemas.patch	2014-10-01 20:45:51 UTC (rev 119986)
@@ -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


Property changes on: lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property