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

[Jan Steffens]

    Date: Sunday, September 2, 2018 @ 00:36:33
  Author: heftig
Revision: 333192

2.58.0-1

Modified:
  glib2/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-01 22:47:19 UTC (rev 333191)
+++ PKGBUILD	2018-09-02 00:36:33 UTC (rev 333192)
@@ -1,9 +1,9 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.56.2
+pkgver=2.58.0
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -10,12 +10,12 @@
 license=(LGPL2.1)
 arch=(x86_64)
 depends=(pcre libffi libutil-linux zlib)
-makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux dbus)
+makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus)
 checkdepends=(desktop-file-utils)
 optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
             'libelf: gresource inspection tool')
 options=(!emptydirs)
-_commit=d4b60396c79c7294ab69a2c591518e76ab17b603  # tags/2.56.2^0
+_commit=f0b57dd7a80425264e318f85c331a039a3cddd87  # tags/2.58.0^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
         noisy-glib-compile-schemas.diff
         glib-compile-schemas.hook gio-querymodules.hook)
@@ -34,38 +34,26 @@
 
   # Suppress noise from glib-compile-schemas.hook
   patch -Np1 -i ../noisy-glib-compile-schemas.diff
-
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  local debug=minimum
-  check_option debug y && debug=yes
-
-  cd glib
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --sysconfdir=/etc \
-    --with-pcre=system \
-    --enable-debug=$debug \
-    --enable-gtk-doc \
-    --disable-fam
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson glib build \
+    -D selinux=false \
+    -D man=true \
+    -D gtk_doc=true
+  ninja -C build
 }
 
 check() {
-  cd glib
-  make check
+  meson test -C build -t 2
 }
 
 package_glib2() {
-  cd glib
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
   mv "$pkgdir/usr/share/gtk-doc" "$srcdir"
-
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+  python -m compileall "$pkgdir/usr/share/glib-2.0/codegen"
+  python -O -m compileall "$pkgdir/usr/share/glib-2.0/codegen"
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 }
 
 package_glib2-docs() {
@@ -79,3 +67,5 @@
 
   install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING
 }
+
+# vim:set sw=2 et: