From 2601908d7eb0e806422ece19d641bd623ae7328a Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Thu, 11 Apr 2024 14:23:00 +0300
Subject: extra/mutter: Redo test patching

---
 extra/mutter/PKGBUILD       | 21 +++--------------
 extra/mutter/fix-build.diff | 55 ---------------------------------------------
 2 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 extra/mutter/fix-build.diff

(limited to 'extra/mutter')

diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 9730cd31..b3deaff5 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,22 +1,7 @@
-# ignoring failing tests temporarily to unblock gnome-shell (FS32#189)
+# Temporarily disable tests
 eval "$(
-  declare -f _check | \
+  declare -f check | \
     sed '
-      s/\(meson test -C build\)/\1 || true/
+      s/xvfb-run/echo xvfb-run/
     '
 )"
-
-source+=(fix-build.diff)
-b2sums+=('2795c0b1f6f4a9a200281943c70fde0896d86127200e49b6cdd7469cd3c9eb29c906b09e08663f7bf71d2876f753e444fa2bb96b7ab3fa9d144bfd37cc1324c5')
-
-eval "$(
-  {
-    declare -f prepare || \
-    printf 'prepare() {\n}\n'
-  } \
-  | sed '
-    $i cd "$srcdir/$pkgname" \
-       # fix build with libglvnd'"'"'s EGL headers \
-       git apply -3 ../fix-build.diff
-  '
-)"
diff --git a/extra/mutter/fix-build.diff b/extra/mutter/fix-build.diff
deleted file mode 100644
index 79d1e6de..00000000
--- a/extra/mutter/fix-build.diff
+++ /dev/null
@@ -1,55 +0,0 @@
- cogl/cogl/meson.build       | 2 +-
- src/backends/meta-egl-ext.h | 1 +
- src/backends/meta-egl.c     | 1 +
- src/backends/meta-egl.h     | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git c/cogl/cogl/meson.build i/cogl/cogl/meson.build
-index 1057ef955..9a642947d 100644
---- c/cogl/cogl/meson.build
-+++ i/cogl/cogl/meson.build
-@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
- built_headers += [cogl_gl_header_h]
- 
- if have_egl
--  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
-+  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
- else
-   cogl_egl_includes_string = ''
- endif
-diff --git c/src/backends/meta-egl-ext.h i/src/backends/meta-egl-ext.h
-index 8705e7d5b..db0b74f76 100644
---- c/src/backends/meta-egl-ext.h
-+++ i/src/backends/meta-egl-ext.h
-@@ -29,6 +29,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- /*
-  * This is a little different to the tests shipped with EGL implementations,
-diff --git c/src/backends/meta-egl.c i/src/backends/meta-egl.c
-index 6554be935..fdeff4f77 100644
---- c/src/backends/meta-egl.c
-+++ i/src/backends/meta-egl.c
-@@ -27,6 +27,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <gio/gio.h>
- #include <glib.h>
- #include <glib-object.h>
-diff --git c/src/backends/meta-egl.h i/src/backends/meta-egl.h
-index f2a816445..4591e7d85 100644
---- c/src/backends/meta-egl.h
-+++ i/src/backends/meta-egl.h
-@@ -28,6 +28,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <glib-object.h>
- 
- #define META_EGL_ERROR meta_egl_error_quark ()
-- 
cgit v1.2.3-70-g09d2