fix build again

4 files changed, 6 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9147f7a9ebf7..bd527ec01fc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mir-git
 	pkgdesc = Canonical's display server
 	pkgver = 1.5.0+120+g5fdc44755a
-	pkgrel = 2
+	pkgrel = 3
 	url = https://mir-server.io
 	arch = x86_64
 	arch = i686
@@ -54,8 +54,8 @@ pkgbase = mir-git
 	source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch
 	source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch
 	sha256sums = SKIP
-	sha256sums = b86c2359309b951fdb574de9381d2fc879709a4be81d22b9f6cb10198c26b3a4
-	sha256sums = 1e1a1b188db2fa540c200bf66e15473230f91cdadffa3040985ec4b7503ce2bd
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = mir-git
 
diff --git a/1087.patch b/1087.patch
deleted file mode 100644
index 600203d8febd..000000000000
--- a/1087.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c13312017a061a31188510417885014e7778c7e7 Mon Sep 17 00:00:00 2001
-From: William Wold <wm@wmww.sh>
-Date: Fri, 22 Nov 2019 13:03:00 -0500
-Subject: [PATCH] Replace DMESA_EGL_NO_X11_HEADERS with DEGL_NO_X11 (fixes
- 1086)
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 588b14c7f2..df102018ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,7 +213,7 @@ add_definitions(
- )
- endif(MIR_DISABLE_EPOLL_REACTOR)
- 
--add_definitions(-DMESA_EGL_NO_X11_HEADERS)
-+add_definitions(-DEGL_NO_X11)
- 
- pkg_check_modules(WAYLAND_EGLSTREAM wayland-eglstream)
- 
diff --git a/1088.patch b/1088.patch
deleted file mode 100644
index 3a4cddada945..000000000000
--- a/1088.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e622516c1b4f1c54b53c55126ec5b231432500e7 Mon Sep 17 00:00:00 2001
-From: William Wold <wm@wmww.sh>
-Date: Fri, 22 Nov 2019 12:32:28 -0500
-Subject: [PATCH] Forward declare wl types to fix build on Arch
-
----
- include/test/mir/test/doubles/mock_egl.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/test/mir/test/doubles/mock_egl.h b/include/test/mir/test/doubles/mock_egl.h
-index 6aa5ca990a..8e942fd9d6 100644
---- a/include/test/mir/test/doubles/mock_egl.h
-+++ b/include/test/mir/test/doubles/mock_egl.h
-@@ -35,6 +35,9 @@
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
- 
-+struct wl_display;
-+struct wl_resource;
-+
- namespace mir
- {
- namespace test
diff --git a/PKGBUILD b/PKGBUILD
index 72d7a3b27c7c..4cd3bb0170ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=mir-git
 _pkgname=mir
 pkgver=1.5.0+120+g5fdc44755a
-pkgrel=2
+pkgrel=3
 pkgdesc="Canonical's display server"
 url='https://mir-server.io'
 arch=(x86_64 i686 armv7h aarch64)
@@ -22,8 +22,8 @@ source=('git+https://github.com/MirServer/mir.git'
         'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch'
         'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch')
 sha256sums=('SKIP'
-            'b86c2359309b951fdb574de9381d2fc879709a4be81d22b9f6cb10198c26b3a4'
-            '1e1a1b188db2fa540c200bf66e15473230f91cdadffa3040985ec4b7503ce2bd')
+            'SKIP'
+            'SKIP')
 
 BUILD_DIR=build