From cee0f4f69a65b91f163a7db68e67b41509b84595 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 17 Jul 2023 01:33:00 +0000
Subject: [PATCH] extra/meson to 1.2.0-1

---
 extra/meson/0001-Skip-broken-tests.patch      |  2 +-
 .../0002-Use-C-17-for-protobuf-tests.patch    | 20 +++++++++++++++++++
 extra/meson/PKGBUILD                          | 17 +++++++++-------
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 extra/meson/0002-Use-C-17-for-protobuf-tests.patch

diff --git a/extra/meson/0001-Skip-broken-tests.patch b/extra/meson/0001-Skip-broken-tests.patch
index 4aa961100..7d0dd4b9e 100644
--- a/extra/meson/0001-Skip-broken-tests.patch
+++ b/extra/meson/0001-Skip-broken-tests.patch
@@ -21,7 +21,7 @@ index 66ecd43552f6..1519155e3405 100644
        ]
      }
 diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
-index c94169ad8e37..dce2787ec81b 100644
+index 373887401f0d..12741c557fbc 100644
 --- a/unittests/linuxliketests.py
 +++ b/unittests/linuxliketests.py
 @@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests):
diff --git a/extra/meson/0002-Use-C-17-for-protobuf-tests.patch b/extra/meson/0002-Use-C-17-for-protobuf-tests.patch
new file mode 100644
index 000000000..881b5579d
--- /dev/null
+++ b/extra/meson/0002-Use-C-17-for-protobuf-tests.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Wed, 12 Jul 2023 00:10:11 +0200
+Subject: [PATCH] Use C++17 for protobuf tests
+
+Recent protobuf no longer supports C++11.
+---
+ test cases/frameworks/5 protocol buffers/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
+index 046847a89297..f9e677c95f8f 100644
+--- a/test cases/frameworks/5 protocol buffers/meson.build	
++++ b/test cases/frameworks/5 protocol buffers/meson.build	
+@@ -1,4 +1,4 @@
+-project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++11'])
++project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++17'])
+ 
+ protoc = find_program('protoc', required : false)
+ dep = dependency('protobuf', required : false)
diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD
index 02baf45fd..2f337a93d 100644
--- a/extra/meson/PKGBUILD
+++ b/extra/meson/PKGBUILD
@@ -6,7 +6,7 @@
 #  - disable lto in arch-meson
 
 pkgname=meson
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="High productivity build system"
 url="https://mesonbuild.com/"
@@ -72,15 +72,17 @@ source=(
   https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz{,.asc}
   meson-reference-$pkgver.3::https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-reference.3
   meson-reference-$pkgver.json::https://github.com/mesonbuild/meson/releases/download/$pkgver/reference_manual.json
-  0001-Skip-broken-tests.patch
   arch-meson
+  0001-Skip-broken-tests.patch
+  0002-Use-C-17-for-protobuf-tests.patch
 )
-b2sums=('295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a'
+b2sums=('a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3'
         'SKIP'
-        '667fa519da08ffbb6befe7fce3db7e3df44bc722c0c7b679fd4369f59afa20a886cea2ed0d3d2c7d7973696e9a57d61c66f0b3a9cfb6e881ceb5f7ee7a26175c'
-        '4661d7b9643eec3d73af156f8401cadfcc6798e966fbd1bb40b5f87e3a72297e27259a9fa1d32f54806fe16fd129ed142910d30661e7c9a33f666ff7261b5e1d'
-        '742e2c16c6c464e939f68ec7f58951836a75a0fc0170ada25826e7dbc7191bd289f66bfe683941a5ff98d102fd54aeda2c407e9d2ab4276cf607a82ab948093b'
-        '801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1')
+        'eb67d25e967aaeaec9453bf9af6229cbefd6fa75982e3782e703b440359d8042690d1c8a9542773dcf160af03f36a18e3b9ae3426cf566aa3679164317e774f4'
+        '9bb2565a8667b71c901aa690b4eb36b64011191cd7a9420c244350d0d9659657347e8a9852945fcc606f8d235af92d18adaf5804ccb60fa1fc285dba79fd1126'
+        '801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1'
+        '26f95bfa9ffcc602b8cacc6c6e2dfe2a3a144649e570844a66373fa8a8c2400767d58486579790099bb30f34943209edf958143c31b3e25d76200b6092f9bb3e'
+        'a60bbc46b1b3d1067716ff912ecd09c09c22460fac27105e591cb77905d4c8ca43e59f3f5a644737d68dd408a77071eb07e65e88731f3673363ba7b57d587071')
 validpgpkeys=(
   19E2D6D9B46D8DAA6288F877C24E631BABB1FE70  # Jussi Pakkanen <jpakkane@gmail.com>
 )
@@ -88,6 +90,7 @@ validpgpkeys=(
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../0001-Skip-broken-tests.patch
+  patch -Np1 -i ../0002-Use-C-17-for-protobuf-tests.patch
 }
 
 build() {