extra/meson to 1.6.0-1

This commit is contained in:
Kevin Mihelich 2024-10-20 21:37:30 +00:00
parent 007a6786b5
commit 6f5c1ff857
4 changed files with 26 additions and 23 deletions

View file

@ -1,6 +1,6 @@
pkgbase = meson pkgbase = meson
pkgdesc = High productivity build system pkgdesc = High productivity build system
pkgver = 1.5.2 pkgver = 1.6.0
pkgrel = 1 pkgrel = 1
url = https://mesonbuild.com/ url = https://mesonbuild.com/
arch = any arch = any
@ -49,6 +49,7 @@ pkgbase = meson
checkdepends = vala checkdepends = vala
checkdepends = valgrind checkdepends = valgrind
checkdepends = vulkan-validation-layers checkdepends = vulkan-validation-layers
checkdepends = wayland-protocols
checkdepends = wxgtk3 checkdepends = wxgtk3
makedepends = python-build makedepends = python-build
makedepends = python-installer makedepends = python-installer
@ -58,22 +59,22 @@ pkgbase = meson
depends = ninja depends = ninja
depends = python depends = python
depends = python-tqdm depends = python-tqdm
source = https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-1.5.2.tar.gz source = https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz
source = https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-1.5.2.tar.gz.asc source = https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz.asc
source = meson-reference-1.5.2.3::https://github.com/mesonbuild/meson/releases/download/1.5.2/meson-reference.3 source = meson-reference-1.6.0.3::https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-reference.3
source = meson-reference-1.5.2.json::https://github.com/mesonbuild/meson/releases/download/1.5.2/reference_manual.json source = meson-reference-1.6.0.json::https://github.com/mesonbuild/meson/releases/download/1.6.0/reference_manual.json
source = arch-meson source = arch-meson
source = cross-lib32 source = cross-lib32
source = native-clang source = native-clang
source = 0001-Skip-broken-tests.patch source = 0001-Skip-broken-tests.patch
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
b2sums = bda0742cf053cb235833b347e66b8706983815fda5d62815aa6455980837e061fb0db2f7472966e6e09a199b0850477a3b448b6ad3b7db717da6b43906cbe2ac b2sums = c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893
b2sums = SKIP b2sums = SKIP
b2sums = 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 b2sums = 18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd
b2sums = ebeb999962da83587027702d714321d6d01fef3cb4f11a4cb64484e154291a2f917337a67739d1a116b603cfd1dc0068fde20e56b45ab35aba9fe8ce25fcb69b b2sums = 4d3bbf98706fd5c1e80da562ea2e737625db455e2eea30d1457a78862afa0b51456d5368abe19542cd524bd96d14d5cb33a22909d988be17e6ecb26929c49bb2
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081 b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums = ee2b3a174c86affd7b5c26128eda7c51f8b223184eb4a67d957fb32a1396068e5b2613bfdb142134e4ceb8b64dd4464fad3a73e2b4087e0a87f9d0ccb83203d8 b2sums = f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54
pkgname = meson pkgname = meson

View file

@ -1,4 +1,5 @@
[meson] [meson]
source = "git" source = "github"
git = "https://github.com/mesonbuild/meson.git" github = "mesonbuild/meson"
use_max_tag = true
include_regex = '\d+(\.\d+)*' include_regex = '\d+(\.\d+)*'

View file

@ -9,12 +9,12 @@ Subject: [PATCH] Skip broken tests
2 files changed, 4 insertions(+) 2 files changed, 4 insertions(+)
diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build
index f612e1d52d6d..d0e0d079a069 100644 index 812dcf9c5c19..cb25be2f36bd 100644
--- a/test cases/linuxlike/13 cmake dependency/meson.build --- a/test cases/linuxlike/13 cmake dependency/meson.build
+++ b/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build
@@ -7,6 +7,8 @@ if not cmake.found() @@ -4,6 +4,8 @@ project('external CMake dependency', ['c', 'cpp'])
error('MESON_SKIP_TEST cmake binary not available.')
endif cmake = find_program('cmake')
+error('MESON_SKIP_TEST flaky, see https://github.com/mesonbuild/meson/issues/10104') +error('MESON_SKIP_TEST flaky, see https://github.com/mesonbuild/meson/issues/10104')
+ +
@ -22,10 +22,10 @@ index f612e1d52d6d..d0e0d079a069 100644
dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index ea86784892f3..864021688121 100644 index 3ac98076095c..ea3d950d1a5f 100644
--- a/unittests/linuxliketests.py --- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py
@@ -312,6 +312,7 @@ class LinuxlikeTests(BasePlatformTests): @@ -313,6 +313,7 @@ class LinuxlikeTests(BasePlatformTests):
raise SkipTest('asan not available on Cygwin') raise SkipTest('asan not available on Cygwin')
if is_openbsd(): if is_openbsd():
raise SkipTest('-fsanitize=address is not supported on OpenBSD') raise SkipTest('-fsanitize=address is not supported on OpenBSD')
@ -33,7 +33,7 @@ index ea86784892f3..864021688121 100644
testdir = os.path.join(self.framework_test_dir, '7 gnome') testdir = os.path.join(self.framework_test_dir, '7 gnome')
self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false']) self.init(testdir, extra_args=['-Db_sanitize=address', '-Db_lundef=false'])
@@ -983,6 +984,7 @@ class LinuxlikeTests(BasePlatformTests): @@ -997,6 +998,7 @@ class LinuxlikeTests(BasePlatformTests):
raise SkipTest('asan not available on Cygwin') raise SkipTest('asan not available on Cygwin')
if is_openbsd(): if is_openbsd():
raise SkipTest('-fsanitize=address is not supported on OpenBSD') raise SkipTest('-fsanitize=address is not supported on OpenBSD')

View file

@ -6,7 +6,7 @@
# - disable lto in arch-meson # - disable lto in arch-meson
pkgname=meson pkgname=meson
pkgver=1.5.2 pkgver=1.6.0
pkgrel=1 pkgrel=1
pkgdesc="High productivity build system" pkgdesc="High productivity build system"
url="https://mesonbuild.com/" url="https://mesonbuild.com/"
@ -69,6 +69,7 @@ checkdepends=(
vala vala
valgrind valgrind
vulkan-validation-layers vulkan-validation-layers
wayland-protocols
wxgtk3 wxgtk3
) )
source=( source=(
@ -80,14 +81,14 @@ source=(
native-clang native-clang
0001-Skip-broken-tests.patch 0001-Skip-broken-tests.patch
) )
b2sums=('bda0742cf053cb235833b347e66b8706983815fda5d62815aa6455980837e061fb0db2f7472966e6e09a199b0850477a3b448b6ad3b7db717da6b43906cbe2ac' b2sums=('c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893'
'SKIP' 'SKIP'
'0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23' '18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd'
'ebeb999962da83587027702d714321d6d01fef3cb4f11a4cb64484e154291a2f917337a67739d1a116b603cfd1dc0068fde20e56b45ab35aba9fe8ce25fcb69b' '4d3bbf98706fd5c1e80da562ea2e737625db455e2eea30d1457a78862afa0b51456d5368abe19542cd524bd96d14d5cb33a22909d988be17e6ecb26929c49bb2'
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af' '70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081' '9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
'ee2b3a174c86affd7b5c26128eda7c51f8b223184eb4a67d957fb32a1396068e5b2613bfdb142134e4ceb8b64dd4464fad3a73e2b4087e0a87f9d0ccb83203d8') 'f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54')
validpgpkeys=( validpgpkeys=(
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com> 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
) )