[arch-commits] Commit in lib32-glib2/trunk (PKGBUILD gio-querymodules-32.hook)

[Laurent Carlier]

    Date: Friday, October 21, 2016 @ 07:55:02
  Author: lcarlier
Revision: 192795

upgpkg: lib32-glib2 2.50.1-1

upstream update 2.50.1

Added:
  lib32-glib2/trunk/gio-querymodules-32.hook
Modified:
  lib32-glib2/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   35 +++++++++++++++++++++++++----------
 gio-querymodules-32.hook |   11 +++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-21 07:39:11 UTC (rev 192794)
+++ PKGBUILD	2016-10-21 07:55:02 UTC (rev 192795)
@@ -5,23 +5,32 @@
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.48.1
+pkgver=2.50.1
 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-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib' 'python')
-options=('!docs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
-        'revert-warn-glib-compile-schemas.patch')
-sha256sums=('74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612'
+depends=(lib32-dbus lib32-libffi lib32-pcre lib32-util-linux lib32-elfutils "$_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)
+sha256sums=('SKIP'
+            'e36da43ac0f705860646d4aecf66f82030bb0926814b5d4ec4e3284f24fecc36'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
+pkgver() {
+  cd glib
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd "${srcdir}/glib-${pkgver}"
+  cd glib
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -29,14 +38,15 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd "${srcdir}/glib-${pkgver}"
+  cd glib
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libdir=/usr/lib32 --with-pcre=system --disable-fam
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd "${srcdir}/glib-${pkgver}"
+  cd glib
   make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/{etc,usr/{share,include}}
 
@@ -45,4 +55,9 @@
   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
+
+  # install hook
+  install -d "$pkgdir/usr/share/libalpm/hooks/"
+  install -m644 "$srcdir"/gio-querymodules-32.hook \
+    "$pkgdir/usr/share/libalpm/hooks/"
 }

Added: gio-querymodules-32.hook
===================================================================
--- gio-querymodules-32.hook	                        (rev 0)
+++ gio-querymodules-32.hook	2016-10-21 07:55:02 UTC (rev 192795)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib32/gio/modules/*.so
+
+[Action]
+Description = Updating GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules