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

[Jan Steffens]

    Date: Tuesday, January 12, 2021 @ 08:36:30
  Author: heftig
Revision: 819220

2.66.4-2: Add a libalpm gio-querymodules-32 script to match glib2

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

----------------------------+
 PKGBUILD                   |    8 +++++---
 gio-querymodules-32.hook   |    5 +++--
 gio-querymodules-32.script |    7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-12 07:09:24 UTC (rev 819219)
+++ PKGBUILD	2021-01-12 08:36:30 UTC (rev 819220)
@@ -5,7 +5,7 @@
 
 pkgname=lib32-glib2
 pkgver=2.66.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL)
@@ -17,10 +17,11 @@
 _commit=bacbec652d356895ec493f3de2f2f6f4c7dafde0  # tags/2.66.4^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         multilib.diff
-        gio-querymodules-32.hook)
+        gio-querymodules-32.{hook,script})
 sha256sums=('SKIP'
             '2611ec4c97346c3c4eea61786ee20c801207135a9d52a771f5f340b41bf69fbc'
-            'c37b2777d6c7b9d2eb6003d8bdb72175f889013bc4d582b3f7a12fc7419a2d6d')
+            '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946'
+            '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21')
 
 pkgver() {
   cd glib
@@ -63,6 +64,7 @@
   mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
 
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+  install -D gio-querymodules-32.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules-32"
 }
 
 # vim:set sw=2 et:

Modified: gio-querymodules-32.hook
===================================================================
--- gio-querymodules-32.hook	2021-01-12 07:09:24 UTC (rev 819219)
+++ gio-querymodules-32.hook	2021-01-12 08:36:30 UTC (rev 819220)
@@ -3,9 +3,10 @@
 Operation = Install
 Operation = Upgrade
 Operation = Remove
-Target = usr/lib32/gio/modules/*.so
+Target = usr/lib32/gio/modules/
 
 [Action]
 Description = Updating 32-bit GIO module cache...
 When = PostTransaction
-Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules
+Exec = /usr/share/libalpm/scripts/gio-querymodules-32
+NeedsTargets

Added: gio-querymodules-32.script
===================================================================
--- gio-querymodules-32.script	                        (rev 0)
+++ gio-querymodules-32.script	2021-01-12 08:36:30 UTC (rev 819220)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while read -r d; do
+  [[ -d $d ]] || continue
+  gio-querymodules-32 "$d"
+  rmdir --ignore-fail-on-non-empty "$d"
+done