From c518c9338db8fdde0fa4dd67643765d660bfe506 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 3 May 2023 23:30:10 +0000
Subject: [PATCH] extra/meson to 1.1.0-1

---
 extra/meson/0001-Skip-broken-tests.patch | 33 ++++++++++++------------
 extra/meson/PKGBUILD                     | 27 +++++++++++--------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/extra/meson/0001-Skip-broken-tests.patch b/extra/meson/0001-Skip-broken-tests.patch
index 5f5686d2a..4aa961100 100644
--- a/extra/meson/0001-Skip-broken-tests.patch
+++ b/extra/meson/0001-Skip-broken-tests.patch
@@ -4,25 +4,24 @@ Date: Thu, 14 Apr 2022 14:08:15 +0000
 Subject: [PATCH] Skip broken tests
 
 ---
- test cases/linuxlike/13 cmake dependency/meson.build | 2 ++
- unittests/linuxliketests.py                          | 2 ++
- 2 files changed, 4 insertions(+)
+ test cases/frameworks/15 llvm/test.json | 1 -
+ unittests/linuxliketests.py             | 2 ++
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build
-index 193ad184b637..e94ba68ac30f 100644
---- a/test cases/linuxlike/13 cmake dependency/meson.build	
-+++ b/test cases/linuxlike/13 cmake dependency/meson.build	
-@@ -6,6 +6,8 @@ if not find_program('cmake', required: false).found()
-   error('MESON_SKIP_TEST cmake binary not available.')
- endif
- 
-+error('MESON_SKIP_TEST flaky, see https://github.com/mesonbuild/meson/issues/10104')
-+
- # Zlib is probably on all dev machines.
- 
- dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
+diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
+index 66ecd43552f6..1519155e3405 100644
+--- a/test cases/frameworks/15 llvm/test.json	
++++ b/test cases/frameworks/15 llvm/test.json	
+@@ -7,7 +7,6 @@
+         { "val": "combination", "skip_on_jobname": ["msys2-gcc"]}
+       ],
+       "link-static": [
+-        { "val": true, "skip_on_jobname": ["opensuse"] },
+         { "val": false }
+       ]
+     }
 diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
-index 50c6b62b02dd..20eb73550e9f 100644
+index c94169ad8e37..dce2787ec81b 100644
 --- a/unittests/linuxliketests.py
 +++ b/unittests/linuxliketests.py
 @@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests):
diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD
index 487b776b0..e533538f5 100644
--- a/extra/meson/PKGBUILD
+++ b/extra/meson/PKGBUILD
@@ -4,21 +4,24 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - disable lto in arch-meson
-#  - add makedepend on python-setuptools
 
 pkgname=meson
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="High productivity build system"
 url="https://mesonbuild.com/"
 arch=(any)
 license=(Apache)
-depends=(ninja python)
+depends=(
+  ninja
+  python-tqdm
+  python-typing_extensions
+)
 makedepends=(
   python-build
   python-installer
-  python-wheel
   python-setuptools
+  python-wheel
 )
 checkdepends=(
   boost
@@ -72,13 +75,15 @@ source=(
   0001-Skip-broken-tests.patch
   arch-meson
 )
-sha512sums=('3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc'
-            'SKIP'
-            '1d8e9786be7b642e0f232749c9504703d9a10e23fa35ceee0da152ebf7c1c07e912d332293f982c46af20895203af4e2a569f895da59faa76cb3e18c7fa6c299'
-            '4580ddc03465f22bc32c27c764740e8ed67203dadc3cf7a61982231c2f60cdcdec9e26114ccefd0d36165adf46aa5b6fc88d6f770cc9f797a8dd1b5e85c09d5c'
-            '30558210317307e720fd4d5d360c15882c5c756aad7b26036bc5875a0599312a711df174a87f29d528181ec88e9d48b2ee82456cf23109907c7ba4b4dcc5c238'
-            '278f5e4de3aa1170d9b4f9f212985d664f44d90ffec727febeeea1ed570046c6469558a5d123a41bf4c2fdf99dbe7832515b06f1ace423c63e2e95ba6d0ef235')
-validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane@gmail.com>
+b2sums=('149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e'
+        'SKIP'
+        '6f8ec9ccee50e8e33c8c289bae0f33887dc998b5753c373afddc050fa2561172f34ec573f701ed1c5c1715fabcaec2daf5d1979709546816a3813396f34178d5'
+        'afc89e9f7c8c0af12ab86c7030c17d045eb1b0758ea813d86fc88f83963795a6a9abe9a45e11829f15f5c7daf49fcc0238c31881060d16e2a0e93197f9215e1d'
+        '742e2c16c6c464e939f68ec7f58951836a75a0fc0170ada25826e7dbc7191bd289f66bfe683941a5ff98d102fd54aeda2c407e9d2ab4276cf607a82ab948093b'
+        '801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1')
+validpgpkeys=(
+  19E2D6D9B46D8DAA6288F877C24E631BABB1FE70  # Jussi Pakkanen <jpakkane@gmail.com>
+)
 
 prepare() {
   cd $pkgname-$pkgver