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

[Jan Steffens]

    Date: Saturday, June 3, 2017 @ 10:54:53
  Author: heftig
Revision: 233694

2.52.2+9+g3245eba16-1

Modified:
  lib32-glib2/trunk/PKGBUILD
  lib32-glib2/trunk/gio-querymodules-32.hook
Deleted:
  lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch

----------------------------------------+
 PKGBUILD                               |   48 ++++++++++++++-----------------
 gio-querymodules-32.hook               |    2 -
 revert-warn-glib-compile-schemas.patch |   33 ---------------------
 3 files changed, 24 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-03 10:51:38 UTC (rev 233693)
+++ PKGBUILD	2017-06-03 10:54:53 UTC (rev 233694)
@@ -1,26 +1,23 @@
 # $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.50.1
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
+pkgver=2.52.2+9+g3245eba16
+pkgrel=1
+pkgdesc="Low level core library (32-bit)"
 url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
+arch=(x86_64)
+license=(LGPL)
 depends=(lib32-dbus lib32-libffi lib32-pcre lib32-util-linux lib32-libelf "$_pkgbasename")
-makedepends=('gcc-multilib' 'python' 'git')
-_commit=e44ea516afeb41d22cebf968b3ea5d9543856df2 # tags/2.50.1^0
-#options=('!docs')
-source=("git://git.gnome.org/glib#commit=$_commit"
-        gio-querymodules-32.hook
-        revert-warn-glib-compile-schemas.patch)
+makedepends=(gcc-multilib python git)
+_commit=3245eba169c439180cc13ed3c76f47298d723031  # glib-2-52
+source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
+        gio-querymodules-32.hook)
 sha256sums=('SKIP'
-            'e36da43ac0f705860646d4aecf66f82030bb0926814b5d4ec4e3284f24fecc36'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+            '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {
   cd glib
@@ -29,7 +26,6 @@
 
 prepare() {
   cd glib
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -39,8 +35,12 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd glib
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libdir=/usr/lib32 --with-pcre=system --disable-fam
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam \
+      --disable-gtk-doc \
+      $(check_option debug y && echo --enable-debug=yes)
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -47,16 +47,14 @@
 
 package() {
   cd glib
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
+  make DESTDIR="$pkgdir" install
 
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
-  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
+  rm -r "$pkgdir"/usr/{share,include}
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -delete
 
-  # install hook
+  mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
+
+  # install hooks
   install -d "$pkgdir/usr/share/libalpm/hooks/"
   install -m644 "$srcdir"/gio-querymodules-32.hook \
     "$pkgdir/usr/share/libalpm/hooks/"

Modified: gio-querymodules-32.hook
===================================================================
--- gio-querymodules-32.hook	2017-06-03 10:51:38 UTC (rev 233693)
+++ gio-querymodules-32.hook	2017-06-03 10:54:53 UTC (rev 233694)
@@ -6,6 +6,6 @@
 Target = usr/lib32/gio/modules/*.so
 
 [Action]
-Description = Updating GIO module cache...
+Description = Updating 32-bit GIO module cache...
 When = PostTransaction
 Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules

Deleted: revert-warn-glib-compile-schemas.patch
===================================================================
--- revert-warn-glib-compile-schemas.patch	2017-06-03 10:51:38 UTC (rev 233693)
+++ revert-warn-glib-compile-schemas.patch	2017-06-03 10:54:53 UTC (rev 233694)
@@ -1,33 +0,0 @@
-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