From b43ded72a692ff76968fe6be1d93a495924a7e67 Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Mon, 8 Apr 2024 13:24:56 +0300
Subject: core/glib2: Clean up patch

---
 core/glib2/PKGBUILD | 51 ++++++---------------------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

(limited to 'core/glib2/PKGBUILD')

diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index fd577a7e..2d6cf671 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,47 +1,8 @@
-# https://gitlab.gnome.org/GNOME/glib/issues/1626
-# gvariant is not properly aligned:
-# GLib:ERROR:../glib/glib/gvariant-serialiser.c:174:g_variant_serialised_check: 
-# assertion failed (alignment & (gsize) serialised.data == 0): (3 == 0)
-# 23/256 glib:glib+slow / gvariant test fails
-# there is a fix for 2.60, but will not backport to 2.58.2
+# The timer test is still flaky, so ignore the tests for now
+# https://gitlab.gnome.org/GNOME/glib/-/issues/820#note_2076472
 eval "$(
-  declare -f check | \
-    sed '
-      s/meson test -C build/meson test -C build || true/
-    '
-)"
-
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # all but one test succeed, for now disable testing
-  # ERROR: timer - too few tests run (expected 7, got 0)
-  # ERROR: timer - exited with status 134 (terminated by signal 6?)
-  eval "$(
-    declare -f check | \
-      sed '
-        s/\(meson test.*\)/\1 || true/
-      '
-  )"
-fi
-
-# remove usr/lib/installed-tests only if it exists
-eval "$(
-  declare -f package_glib2 | \
-    sed '
-      s@rm -r "$pkgdir/usr/lib/installed-tests@test -d "$pkgdir/usr/lib/installed-tests" \&\& rm -r "$pkgdir/usr/lib/installed-tests@
-    '
-)"
-
-# installing gtkdoc fails currently with not being able to find
-# glib-object.h, no clue why. Dropping building the documentation
-# for now
-eval "$(
-  declare -f build | \
-    sed '
-      s/-D gtk_doc=true/-D gtk_doc=false/
-    '
-  declare -f package_glib2 | \
-    sed '
-      /mv.*gtk-doc/d
-    '
+declare -f check | \
+  sed '
+    s/\(meson test.*\)/\1 || true/
+  '
 )"
-- 
cgit v1.2.3-70-g09d2