From 44a14dec1c8027f4fb1ae7a2b465a2f6b78fb9d5 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 10 Mar 2019 17:09:40 +0000
Subject: [PATCH] core/glib2 to 2.60.0-1

---
 core/glib2/PKGBUILD | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 2b62df2f9..8f3ed517d 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -3,10 +3,11 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to fix v5 FTBFS with meson
+#  - disable docs
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.58.3
+pkgver=2.60.0
 pkgrel=1
 pkgdesc="Low level core library"
 url="https://wiki.gnome.org/Projects/GLib"
@@ -18,7 +19,7 @@ checkdepends=(desktop-file-utils)
 optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
             'libelf: gresource inspection tool')
 options=(!emptydirs)
-_commit=f2d1128ffae0de87680e411fb62ccfccafed6b1c  # tags/2.58.3^0
+_commit=2edc5aa6dfffec0a48c8a1e9381b73d1096e0489  # tags/2.60.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
@@ -47,14 +48,14 @@ prepare() {
 
 build() {
   arch-meson glib build \
-    -D selinux=false \
+    -D selinux=disabled \
     -D man=true \
-    -D gtk_doc=true
+    -D gtk_doc=false
   ninja -C build
 }
 
 check() {
-  meson test -C build
+  meson test -C build --no-suite flaky
 }
 
 package_glib2() {
@@ -64,8 +65,11 @@ package_glib2() {
   python -m compileall -d /usr/share/glib-2.0/codegen "$pkgdir/usr/share/glib-2.0/codegen"
   python -O -m compileall -d /usr/share/glib-2.0/codegen "$pkgdir/usr/share/glib-2.0/codegen"
 
+  # Remove installed tests
+  rm -rf "$pkgdir/usr/lib/installed-tests"
+
   # Split docs
-  mv "$pkgdir/usr/share/gtk-doc" "$srcdir"
+  #mv "$pkgdir/usr/share/gtk-doc" "$srcdir"
 }
 
 package_glib2-docs() {
@@ -75,7 +79,7 @@ package_glib2-docs() {
   license+=(custom)
 
   mkdir -p "$pkgdir/usr/share"
-  mv gtk-doc "$pkgdir/usr/share"
+  #mv gtk-doc "$pkgdir/usr/share"
 
   install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING
 }