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

[Jan Steffens]

    Date: Saturday, March 17, 2018 @ 18:55:09
  Author: heftig
Revision: 308964

2.56.0+7+g66948ae23-1

Modified:
  lib32-glib2/trunk/PKGBUILD

----------+
 PKGBUILD |   55 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-17 18:42:18 UTC (rev 308963)
+++ PKGBUILD	2018-03-17 18:55:09 UTC (rev 308964)
@@ -3,26 +3,21 @@
 # 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.54.3+2+g94b38beff
+pkgname=lib32-glib2
+pkgver=2.56.0+7+g66948ae23
 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 "$_pkgbasename")
-makedepends=(gettext shared-mime-info python lib32-libelf git meson lib32-dbus)
-checkdepends=(desktop-file-utils)
+depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib glib2)
+makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux lib32-dbus)
+checkdepends=(desktop-file-utils lib32-glib2)
 options=(!emptydirs)
-_commit=94b38beff1347ec4a733199f7a7abdacaa958678  # glib-2-54~16
-source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
-        0001-meson-Fix-libmount-support.patch
-        libs.diff
+_commit=66948ae231f75a548c8a2eb7b3a9d64cfd728b8e  # glib-2-56
+source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         gio-querymodules-32.hook)
 sha256sums=('SKIP'
-            '14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629'
-            '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
             '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {
@@ -31,41 +26,43 @@
 }
 
 prepare() {
-  mkdir -p build
   cd glib
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=789681
-  patch -Np1 -i ../0001-meson-Fix-libmount-support.patch
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=788773
-  patch -Np1 -i ../libs.diff
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
+  local debug=minimum
+  check_option debug n && debug=yes
+
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd build
-  arch-meson ../glib --libdir=/usr/lib32 \
-    -Dwith-docs=no -Dwith-man=no
-  ninja
+  cd glib
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --sysconfdir=/etc \
+    --with-pcre=system \
+    --enable-debug=$debug \
+    --disable-gtk-doc \
+    --disable-fam
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
 }
 
 check() {
-  cd build
-  meson test -t 2
+  cd glib
+  make check
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
-
+  cd glib
+  make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{share,include}
   find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -delete
-
   mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
 
-  # install hooks
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
 }