Merge branch 'master' into i486

1 files changed, 5 insertions, 27 deletions

diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 27be5242..f91bb31c 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,34 +1,12 @@
-eval "$(
-  declare -f package_glib2 | \
-    sed '
-      2 a arch=(i486 i686 pentium3 x86_64)
-    '
-  declare -f package_glib2-docs | \
-    sed '
-      2 a arch=(any)
-    '
-)"
-
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
-  # documentation is not built by i486 slave
-  makedepends=(${makedepends[@]//gtk-doc/})
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-gtk-doc//
-      '
-  )"
-
+  # 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 package_glib2 | \
+    declare -f check | \
       sed '
-        /mv.*gtk-doc/d
+        s/\(meson test.*\)/\1 || true/
       '
   )"
-
-  # 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?)
-  unset check
 fi