From bb2e133f3e85373ecc1cd6eefbd6609e83bc187b Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 17 May 2022 13:50:39 -0400
Subject: [glib2-static]: upgrade to v2.72.1

---
 libre/glib2-static/PKGBUILD | 74 ++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

(limited to 'libre/glib2-static/PKGBUILD')

diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD
index 9283512aa..598f7d46c 100644
--- a/libre/glib2-static/PKGBUILD
+++ b/libre/glib2-static/PKGBUILD
@@ -1,68 +1,54 @@
-# Maintainer (Arch:glib2) Jan de Groot <jgc@archlinux.org>
+# Maintainer (aur): nightuser <nightuser.android@gmail.com>
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: bill-auger <bill-auger@programmer.net>
 
 pkgname=glib2-static
-pkgver=2.58.3
+pkgver=2.72.1
 pkgrel=1
-pkgrel+=.static2
-pkgdesc="Low level core library"
-pkgdesc+=" (static libraries)"
+pkgrel+=.static1
+pkgdesc="Low level core library: Static library"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL2.1)
-arch=(x86_64)
-arch+=(i686 armv7h)
-depends=(pcre libffi)
-makedepends=(libffi zlib shared-mime-info python libelf git util-linux meson dbus libxslt docbook-xsl)
-checkdepends=(desktop-file-utils dbus)
-optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
-            'libelf: gresource inspection tool')
+arch+=(armv7h i686 x86_64)
+depends=()
+makedepends=(gettext zlib libffi shared-mime-info python libelf git util-linux meson dbus)
+checkdepends=(desktop-file-utils)
 options=('!docs' '!libtool' '!emptydirs' '!strip' 'staticlibs')
-_commit=f2d1128ffae0de87680e411fb62ccfccafed6b1c  # tags/2.58.3^0
-source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
-        noisy-glib-compile-schemas.diff
-        fix-static-build-589.diff)
-sha256sums=('SKIP'
-            '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
-            'f4790fc845f2b4811ce5df5ef3a7dfcc23a1593ec4e19ae9173bb799a045d00f')
-
-pkgver() {
-  cd glib
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd glib
-
-  # Suppress noise from glib-compile-schemas.hook
-  patch -Np1 -i ../noisy-glib-compile-schemas.diff
-  patch -Np1 -i ../fix-static-build-589.diff
-}
+source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz")
+sha256sums=('c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2')
 
 build() {
+  LTO=""
+  if check_option "lto" "n"; then
+    LTO="-Db_lto=false"
+  fi
+
   if [[ $CARCH = i686 ]]; then
     # GTimer has trouble with x87 math, force SSE2 (which is implied
     # on x86_64).
     CFLAGS+=' -msse2 -mfpmath=sse'
   fi
-
-  arch-meson glib build \
+  CFLAGS+=' -Wno-unused-result -Wno-stringop-overflow'
+  arch-meson "glib-$pkgver" _build \
     --default-library static \
-    -D selinux=false \
-    -D man=true \
-    -D gtk_doc=false \
-    -D internal_pcre=false \
-    -D fam=false
-  ninja -C build
+    --buildtype release \
+    -Dselinux=disabled \
+    -Dman=false \
+    -Dgtk_doc=false \
+    $LTO
+  ninja -C _build
 }
 
 check() {
-  meson test -C build
+  # test # 269 fails in librechroots
+  #   269/269 glib:gio+slow / gdbus-threading TIMEOUT 360.02s killed by signal 15 SIGTERM
+  meson test -C _build --no-suite flaky --timeout-multiplier 2 --print-errorlogs || :
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  DESTDIR="$pkgdir" meson install -C _build
 
-  # remove conflicting files
-  rm -rf "$pkgdir/usr/"{bin,include,share,lib/glib-2.0,lib/pkgconfig} $pkgdir/usr/lib/*.so*
+  # Only install static library
+  rm -rf "$pkgdir"/usr/{bin,include,share,lib/glib-2.0,lib/pkgconfig}
 }
-- 
cgit v1.2.3