[arch-commits] Commit in lib32-glib2/repos/multilib-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Tue May 7 13:37:55 UTC 2019
Date: Tuesday, May 7, 2019 @ 13:37:54
Author: heftig
Revision: 462061
archrelease: copy trunk to multilib-x86_64
Added:
lib32-glib2/repos/multilib-x86_64/PKGBUILD
(from rev 462060, lib32-glib2/trunk/PKGBUILD)
lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook
(from rev 462060, lib32-glib2/trunk/gio-querymodules-32.hook)
lib32-glib2/repos/multilib-x86_64/multilib.diff
(from rev 462060, lib32-glib2/trunk/multilib.diff)
Deleted:
lib32-glib2/repos/multilib-x86_64/PKGBUILD
lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook
lib32-glib2/repos/multilib-x86_64/multilib.diff
--------------------------+
PKGBUILD | 121 +++++++++++++++++++++------------------------
gio-querymodules-32.hook | 22 ++++----
multilib.diff | 24 ++++----
3 files changed, 82 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-07 13:37:42 UTC (rev 462060)
+++ PKGBUILD 2019-05-07 13:37:54 UTC (rev 462061)
@@ -1,62 +0,0 @@
-# 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>
-
-pkgname=lib32-glib2
-pkgver=2.60.1
-pkgrel=1
-pkgdesc="Low level core library (32-bit)"
-url="https://wiki.gnome.org/Projects/GLib"
-license=(LGPL2.1)
-arch=(x86_64)
-depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib glib2)
-makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux meson lib32-dbus)
-checkdepends=(desktop-file-utils lib32-glib2)
-options=(!emptydirs)
-_commit=527022ae143c0ef154edaba449bedd430f382d86 # tags/2.60.1^0
-source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
- multilib.diff
- gio-querymodules-32.hook)
-sha256sums=('SKIP'
- '9c59f120cdccdbd960c5e3aab11f6c3c4b464ff4f7fc267520f5baad7919310a'
- '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
-
-pkgver() {
- cd glib
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd glib
- patch -Np1 -i ../multilib.diff
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- arch-meson glib build \
- -D selinux=disabled \
- --libdir=/usr/lib32
- ninja -C build
-}
-
-check() {
- meson test -C build --no-suite flaky --print-errorlogs
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-
- rm -r "$pkgdir"/usr/{share,include}
- find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -printf 'Removing %P\n' -delete
- mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
-
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
-
- # Remove installed tests
- rm -r "$pkgdir/usr/lib/installed-tests"
-}
-
-# vim:set sw=2 et:
Copied: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 462060, lib32-glib2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-07 13:37:54 UTC (rev 462061)
@@ -0,0 +1,59 @@
+# 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>
+
+pkgname=lib32-glib2
+pkgver=2.60.2
+pkgrel=1
+pkgdesc="Low level core library (32-bit)"
+url="https://wiki.gnome.org/Projects/GLib"
+license=(LGPL2.1)
+arch=(x86_64)
+depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib glib2)
+makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux meson lib32-dbus)
+checkdepends=(desktop-file-utils lib32-glib2)
+options=(!emptydirs)
+_commit=a3b5608170c0b4381d0217ea99325ec7fcecb7f6 # tags/2.60.2^0
+source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+ multilib.diff
+ gio-querymodules-32.hook)
+sha256sums=('SKIP'
+ '9c59f120cdccdbd960c5e3aab11f6c3c4b464ff4f7fc267520f5baad7919310a'
+ '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
+
+pkgver() {
+ cd glib
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd glib
+ patch -Np1 -i ../multilib.diff
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ arch-meson glib build \
+ -D selinux=disabled \
+ --libdir=/usr/lib32
+ ninja -C build
+}
+
+check() {
+ meson test -C build --no-suite flaky --no-suite slow --print-errorlogs
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+
+ rm -r "$pkgdir"/usr/{share,include}
+ find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -printf 'Removing %P\n' -delete
+ mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+}
+
+# vim:set sw=2 et:
Deleted: gio-querymodules-32.hook
===================================================================
--- gio-querymodules-32.hook 2019-05-07 13:37:42 UTC (rev 462060)
+++ gio-querymodules-32.hook 2019-05-07 13:37:54 UTC (rev 462061)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib32/gio/modules/*.so
-
-[Action]
-Description = Updating 32-bit GIO module cache...
-When = PostTransaction
-Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules
Copied: lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook (from rev 462060, lib32-glib2/trunk/gio-querymodules-32.hook)
===================================================================
--- gio-querymodules-32.hook (rev 0)
+++ gio-querymodules-32.hook 2019-05-07 13:37:54 UTC (rev 462061)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib32/gio/modules/*.so
+
+[Action]
+Description = Updating 32-bit GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules
Deleted: multilib.diff
===================================================================
--- multilib.diff 2019-05-07 13:37:42 UTC (rev 462060)
+++ multilib.diff 2019-05-07 13:37:54 UTC (rev 462061)
@@ -1,12 +0,0 @@
-diff --git i/gio/tests/meson.build w/gio/tests/meson.build
-index 5c0e03365..d69346216 100644
---- i/gio/tests/meson.build
-+++ w/gio/tests/meson.build
-@@ -586,6 +586,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
- '-r',
- '-b','binary',
- '@INPUT@',
-+ '--oformat', 'elf32-i386',
- '-o','@OUTPUT@'])
-
- # Rename symbol to match the one in the C file
Copied: lib32-glib2/repos/multilib-x86_64/multilib.diff (from rev 462060, lib32-glib2/trunk/multilib.diff)
===================================================================
--- multilib.diff (rev 0)
+++ multilib.diff 2019-05-07 13:37:54 UTC (rev 462061)
@@ -0,0 +1,12 @@
+diff --git i/gio/tests/meson.build w/gio/tests/meson.build
+index 5c0e03365..d69346216 100644
+--- i/gio/tests/meson.build
++++ w/gio/tests/meson.build
+@@ -586,6 +586,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+ '-r',
+ '-b','binary',
+ '@INPUT@',
++ '--oformat', 'elf32-i386',
+ '-o','@OUTPUT@'])
+
+ # Rename symbol to match the one in the C file
More information about the arch-commits
mailing list