* update meson to 1.7.0-1

This commit is contained in:
Alexander Baldeck 2025-02-03 22:23:31 +01:00
parent 6673717366
commit 0a0799c101
3 changed files with 36 additions and 36 deletions

View File

@ -1,6 +1,6 @@
pkgbase = meson pkgbase = meson
pkgdesc = High productivity build system pkgdesc = High productivity build system
pkgver = 1.6.1 pkgver = 1.7.0
pkgrel = 1 pkgrel = 1
url = https://mesonbuild.com/ url = https://mesonbuild.com/
arch = any arch = any
@ -30,6 +30,7 @@ pkgbase = meson
checkdepends = java-environment=8 checkdepends = java-environment=8
checkdepends = ldc checkdepends = ldc
checkdepends = libelf checkdepends = libelf
checkdepends = libpcap
checkdepends = libwmf checkdepends = libwmf
checkdepends = llvm checkdepends = llvm
checkdepends = mercurial checkdepends = mercurial
@ -43,6 +44,9 @@ pkgbase = meson
checkdepends = python-pytest-xdist checkdepends = python-pytest-xdist
checkdepends = qt5-base checkdepends = qt5-base
checkdepends = qt5-tools checkdepends = qt5-tools
checkdepends = qt6-base
checkdepends = qt6-declarative
checkdepends = qt6-tools
checkdepends = rust checkdepends = rust
checkdepends = rust-bindgen checkdepends = rust-bindgen
checkdepends = sdl2 checkdepends = sdl2
@ -51,32 +55,27 @@ pkgbase = meson
checkdepends = vulkan-validation-layers checkdepends = vulkan-validation-layers
checkdepends = wayland-protocols checkdepends = wayland-protocols
checkdepends = wxgtk3 checkdepends = wxgtk3
makedepends = git
makedepends = python-aiohttp
makedepends = python-build makedepends = python-build
makedepends = python-installer makedepends = python-installer
makedepends = python-setuptools makedepends = python-setuptools
makedepends = python-strictyaml
makedepends = python-wheel makedepends = python-wheel
depends = bash depends = bash
depends = ninja depends = ninja
depends = python depends = python
depends = python-tqdm depends = python-tqdm
source = https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz source = git+https://github.com/mesonbuild/meson?signed#tag=1.7.0
source = https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz.asc
source = meson-reference-1.6.1.3::https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-reference.3
source = meson-reference-1.6.1.json::https://github.com/mesonbuild/meson/releases/download/1.6.1/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
source = 0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
b2sums = 7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235 b2sums = 2969a68dced75e7536686e6c13acb19afaf802d8b42a32de28f25d62213b05c1c6b01c843795f71ea3a48ba010b1152db8dd6c69837617da65ebbb7f6df30bc7
b2sums = SKIP
b2sums = 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7
b2sums = ba2e37d7cf18adfefbff230f140b702b87b22ee409de9dc5407afbe153b90cb66ab6d4063c4b4ce72cbcef2db84288981d52c47698fc7cc2e181924be651c0fa
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081 b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums = 41b5d1fea3ef014b9c52f292bf35bf87f589909a4de316ca324fb717f997a36cfc7bcd82c6f18039ea066131cd630381d275984fb9f3462d468a93d1ca437b2d b2sums = 076f1650bf889b79a390da82e2e0a3d3b14e3383cdf4cd81ee06d7b776e070bb3d681295926828af123c16f950ab5cca127236f3030124fa9e8c7787a2c98297
b2sums = 9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167
pkgname = meson pkgname = meson

View File

@ -22,7 +22,7 @@ index 812dcf9c5c19..cb25be2f36bd 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 55e83750af34..f89e5889b3f4 100644 index a8608c2b123e..54af5171428c 100644
--- a/unittests/linuxliketests.py --- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py
@@ -313,6 +313,7 @@ class LinuxlikeTests(BasePlatformTests): @@ -313,6 +313,7 @@ class LinuxlikeTests(BasePlatformTests):

View File

@ -4,7 +4,7 @@
# Contributor: Anatol Pomozov <anatol dot pomozov at gmail> # Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
pkgname=meson pkgname=meson
pkgver=1.6.1 pkgver=1.7.0
pkgrel=1 pkgrel=1
pkgdesc="High productivity build system" pkgdesc="High productivity build system"
url="https://mesonbuild.com/" url="https://mesonbuild.com/"
@ -17,9 +17,12 @@ depends=(
python-tqdm python-tqdm
) )
makedepends=( makedepends=(
git
python-aiohttp
python-build python-build
python-installer python-installer
python-setuptools python-setuptools
python-strictyaml
python-wheel python-wheel
) )
checkdepends=( checkdepends=(
@ -48,6 +51,7 @@ checkdepends=(
java-environment=8 java-environment=8
ldc ldc
libelf libelf
libpcap
libwmf libwmf
llvm llvm
mercurial mercurial
@ -61,6 +65,9 @@ checkdepends=(
python-pytest-xdist python-pytest-xdist
qt5-base qt5-base
qt5-tools qt5-tools
qt6-base
qt6-declarative
qt6-tools
rust rust
rust-bindgen rust-bindgen
sdl2 sdl2
@ -71,68 +78,62 @@ checkdepends=(
wxgtk3 wxgtk3
) )
source=( source=(
https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz{,.asc} "git+https://github.com/mesonbuild/meson?signed#tag=$pkgver"
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
arch-meson arch-meson
cross-lib32 cross-lib32
native-clang native-clang
0001-Skip-broken-tests.patch 0001-Skip-broken-tests.patch
0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
) )
b2sums=('7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235' b2sums=('2969a68dced75e7536686e6c13acb19afaf802d8b42a32de28f25d62213b05c1c6b01c843795f71ea3a48ba010b1152db8dd6c69837617da65ebbb7f6df30bc7'
'SKIP'
'55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7'
'ba2e37d7cf18adfefbff230f140b702b87b22ee409de9dc5407afbe153b90cb66ab6d4063c4b4ce72cbcef2db84288981d52c47698fc7cc2e181924be651c0fa'
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af' '70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081' '9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
'41b5d1fea3ef014b9c52f292bf35bf87f589909a4de316ca324fb717f997a36cfc7bcd82c6f18039ea066131cd630381d275984fb9f3462d468a93d1ca437b2d' '076f1650bf889b79a390da82e2e0a3d3b14e3383cdf4cd81ee06d7b776e070bb3d681295926828af123c16f950ab5cca127236f3030124fa9e8c7787a2c98297')
'9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167')
validpgpkeys=( validpgpkeys=(
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com> 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
) )
prepare() { prepare() {
cd $pkgname-$pkgver cd meson
# Pass tests # Pass tests
patch -Np1 -i ../0001-Skip-broken-tests.patch patch -Np1 -i ../0001-Skip-broken-tests.patch
patch -Np1 -i ../0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
} }
build() { build() {
cd $pkgname-$pkgver cd meson
python -m build --wheel --no-isolation python -m build --wheel --no-isolation
./meson.py setup docs docs.build --prefix /usr -D html=false
./meson.py compile -C docs.build
} }
check() ( check() (
cd $pkgname-$pkgver cd meson
export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS= export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
./run_tests.py --failfast ./run_tests.py --failfast
) )
package() { package() {
cd $pkgname-$pkgver cd meson
python -m installer --destdir="$pkgdir" dist/*.whl python -m installer --destdir="$pkgdir" dist/*.whl
./meson.py install -C docs.build --destdir "$pkgdir"
install -Dm644 docs.build/reference_manual.json -t "$pkgdir/usr/share/doc/$pkgname"
install -d "$pkgdir/usr/share/vim/vimfiles" install -d "$pkgdir/usr/share/vim/vimfiles"
cp -rt "$pkgdir/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/ cp -rt "$pkgdir/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/
install -Dm644 data/shell-completions/bash/* -t "$pkgdir/usr/share/bash-completion/completions" install -Dm644 data/shell-completions/bash/* -t "$pkgdir/usr/share/bash-completion/completions"
install -Dm644 data/shell-completions/zsh/* -t "$pkgdir/usr/share/zsh/site-functions" install -Dm644 data/shell-completions/zsh/* -t "$pkgdir/usr/share/zsh/site-functions"
install -Dm644 ../meson-reference-$pkgver.3 "$pkgdir/usr/share/man/man3/meson-reference.3"
install -Dm644 ../meson-reference-$pkgver.json "$pkgdir/usr/share/doc/$pkgname/reference_manual.json"
install -D ../arch-meson -t "$pkgdir/usr/bin" install -D ../arch-meson -t "$pkgdir/usr/bin"
install -Dm644 ../cross-lib32 "$pkgdir/usr/share/meson/cross/lib32"
install -Dm644 ../native-clang "$pkgdir/usr/share/meson/native/clang"
case "${CARCH}" in case "${CARCH}" in
x86_64) install -Dm644 ../cross-lib32 "$pkgdir/usr/share/meson/cross/lib32" ;; x86_64)
install -Dm644 ../cross-lib32 "$pkgdir/usr/share/meson/cross/lib32"
;;
esac esac
install -Dm644 ../native-clang "$pkgdir/usr/share/meson/native/clang"
} }
# vim:set sw=2 sts=-1 et: # vim:set sw=2 sts=-1 et: