Apply protobuf headers patch

3 files changed, 36 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 330e2d3e6d81..660a06d8a247 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = mir-git
 	pkgdesc = Canonical's display server
-	pkgver = 0.32.1+309+gf8425b27d9
+	pkgver = 0.32.1+460+gddb262d9ec
 	pkgrel = 1
 	url = https://mir-server.io
 	arch = x86_64
 	arch = i686
+	arch = armv7h
+	arch = aarch64
 	license = GPL
 	license = LGPL
 	makedepends = git
@@ -48,8 +50,10 @@ pkgbase = mir-git
 	conflicts = mir
 	source = git+https://github.com/MirServer/mir.git
 	source = https://raw.githubusercontent.com/capnproto/capnproto/04fd66e2992a3ed38d686642a3c479a7f3e131c9/c%2B%2B/cmake/FindCapnProto.cmake
+	source = protobufHeaders.patch
 	sha256sums = SKIP
 	sha256sums = 83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647
+	sha256sums = 88c025b35f4182fef7eed67db903e2580f69272cfaf38b7078fd571d8762a055
 
 pkgname = mir-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b1ed9df5121..72924fdaa1d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=mir-git
 _pkgname=mir
-pkgver=0.32.1+309+gf8425b27d9
+pkgver=0.32.1+460+gddb262d9ec
 pkgrel=1
 pkgdesc="Canonical's display server"
 url='https://mir-server.io'
-arch=(x86_64 i686)
+arch=(x86_64 i686 armv7h aarch64)
 license=(GPL LGPL)
 conflicts=(mir)
 provides=(mir)
@@ -19,9 +19,11 @@ optdepends=('qterminal: required for miral demos'
             'xcursor-dmz: opt requirement for miral demos'
             'qtubuntu: opt requirement for miral demos')
 source=('git+https://github.com/MirServer/mir.git'
-        'https://raw.githubusercontent.com/capnproto/capnproto/04fd66e2992a3ed38d686642a3c479a7f3e131c9/c%2B%2B/cmake/FindCapnProto.cmake')
+        'https://raw.githubusercontent.com/capnproto/capnproto/04fd66e2992a3ed38d686642a3c479a7f3e131c9/c%2B%2B/cmake/FindCapnProto.cmake'
+        'protobufHeaders.patch')
 sha256sums=('SKIP'
-            '83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647')
+            '83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647'
+            '88c025b35f4182fef7eed67db903e2580f69272cfaf38b7078fd571d8762a055')
 
 BUILD_DIR=build
 
@@ -30,6 +32,8 @@ prepare() {
   git submodule init
   git submodule update
   cp ../FindCapnProto.cmake cmake/
+
+  patch -Np1 -i "${srcdir}/protobufHeaders.patch"
 }
 
 pkgver() {
diff --git a/protobufHeaders.patch b/protobufHeaders.patch
new file mode 100644
index 000000000000..e2d6d222fdfe
--- /dev/null
+++ b/protobufHeaders.patch
@@ -0,0 +1,23 @@
+From ce010778096db14de3b682313fc0376e0c8a6ada Mon Sep 17 00:00:00 2001
+From: William Wold <wm@wmww.sh>
+Date: Tue, 11 Sep 2018 14:58:04 -0700
+Subject: [PATCH] Use -std=gnu++14 instead of -std=c++14 to fix precompiled
+ headers issue on Arch
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e98e309e3a..7990617e75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "${build_types}" FORCE)
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${build_types}")
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Werror -Wall -pedantic -Wextra -fPIC")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=gnu++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")