Date: Monday, April 10, 2023 @ 23:42:12
Author: heftig
Revision: 473847
archrelease: copy trunk to staging-any
Added:
meson/repos/staging-any/0001-Skip-broken-tests.patch
(from rev 473846, meson/trunk/0001-Skip-broken-tests.patch)
meson/repos/staging-any/PKGBUILD
(from rev 473846, meson/trunk/PKGBUILD)
meson/repos/staging-any/arch-meson
(from rev 473846, meson/trunk/arch-meson)
meson/repos/staging-any/keys/
Deleted:
meson/repos/staging-any/0001-Skip-broken-tests.patch
meson/repos/staging-any/PKGBUILD
meson/repos/staging-any/arch-meson
meson/repos/staging-any/keys/
------------------------------+
0001-Skip-broken-tests.patch | 85 +++++++--------
PKGBUILD | 228 +++++++++++++++++++++--------------------
arch-meson | 26 ++--
3 files changed, 172 insertions(+), 167 deletions(-)
Deleted: 0001-Skip-broken-tests.patch
===================================================================
--- 0001-Skip-broken-tests.patch 2023-04-10 23:42:01 UTC (rev 473846)
+++ 0001-Skip-broken-tests.patch 2023-04-10 23:42:12 UTC (rev 473847)
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-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(+)
-
-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/unittests/linuxliketests.py b/unittests/linuxliketests.py
-index 50c6b62b02dd..20eb73550e9f 100644
---- a/unittests/linuxliketests.py
-+++ b/unittests/linuxliketests.py
-@@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests):
- raise SkipTest('asan not available on Cygwin')
- if is_openbsd():
- raise SkipTest('-fsanitize=address is not supported on OpenBSD')
-+ raise SkipTest('cannot run sanitizers in containers without ptrace')
-
- testdir = os.path.join(self.framework_test_dir, '7 gnome')
- self.init(testdir, extra_args=['-Db_sanitize=address',
'-Db_lundef=false'])
-@@ -1014,6 +1015,7 @@ class LinuxlikeTests(BasePlatformTests):
- raise SkipTest('asan not available on Cygwin')
- if is_openbsd():
- raise SkipTest('-fsanitize=address is not supported on OpenBSD')
-+ raise SkipTest('cannot run sanitizers in containers without ptrace')
-
- testdir = os.path.join(self.common_test_dir, '13 pch')
- self.init(testdir, extra_args=['-Db_sanitize=address',
'-Db_lundef=false'])
Copied: meson/repos/staging-any/0001-Skip-broken-tests.patch (from rev 473846,
meson/trunk/0001-Skip-broken-tests.patch)
===================================================================
--- 0001-Skip-broken-tests.patch (rev 0)
+++ 0001-Skip-broken-tests.patch 2023-04-10 23:42:12 UTC (rev 473847)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Thu, 14 Apr 2022 14:08:15 +0000
+Subject: [PATCH] Skip broken tests
+
+---
+ test cases/frameworks/15 llvm/test.json | 1 -
+ unittests/linuxliketests.py | 2 ++
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+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 c94169ad8e37..dce2787ec81b 100644
+--- a/unittests/linuxliketests.py
++++ b/unittests/linuxliketests.py
+@@ -359,6 +359,7 @@ class LinuxlikeTests(BasePlatformTests):
+ raise SkipTest('asan not available on Cygwin')
+ if is_openbsd():
+ raise SkipTest('-fsanitize=address is not supported on OpenBSD')
++ raise SkipTest('cannot run sanitizers in containers without ptrace')
+
+ testdir = os.path.join(self.framework_test_dir, '7 gnome')
+ self.init(testdir, extra_args=['-Db_sanitize=address',
'-Db_lundef=false'])
+@@ -1014,6 +1015,7 @@ class LinuxlikeTests(BasePlatformTests):
+ raise SkipTest('asan not available on Cygwin')
+ if is_openbsd():
+ raise SkipTest('-fsanitize=address is not supported on OpenBSD')
++ raise SkipTest('cannot run sanitizers in containers without ptrace')
+
+ testdir = os.path.join(self.common_test_dir, '13 pch')
+ self.init(testdir, extra_args=['-Db_sanitize=address',
'-Db_lundef=false'])
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-10 23:42:01 UTC (rev 473846)
+++ PKGBUILD 2023-04-10 23:42:12 UTC (rev 473847)
@@ -1,111 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
-
-pkgname=meson
-pkgver=1.0.1
-pkgrel=3
-pkgdesc="High productivity build system"
-url="https://mesonbuild.com/";
-arch=(any)
-license=(Apache)
-depends=(ninja python)
-makedepends=(
- python-build
- python-installer
- python-wheel
- python-setuptools
-)
-checkdepends=(
- boost
- clang
- cmake
- cuda
- cython
- doxygen
- gcc-fortran
- gcc-objc
- git
- gmock
- gnustep-base
- gobject-introspection
- graphviz
- gtest
- gtk-doc
- gtk-sharp-2
- gtk3
- gtkmm3
- hotdoc
- itstool
- java-environment=8
- ldc
- libelf
- libwmf
- llvm
- mercurial
- mono
- nasm
- netcdf-fortran
- openmpi
- openssh
- protobuf
- python-gobject
- python-pytest-xdist
- qt5-base
- qt5-tools
- rust
- rust-bindgen
- sdl2
- vala
- valgrind
- vulkan-validation-layers
- wxgtk3
-)
-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
-)
-sha512sums=('3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc'
- 'SKIP'
-
'1d8e9786be7b642e0f232749c9504703d9a10e23fa35ceee0da152ebf7c1c07e912d332293f982c46af20895203af4e2a569f895da59faa76cb3e18c7fa6c299'
-
'4580ddc03465f22bc32c27c764740e8ed67203dadc3cf7a61982231c2f60cdcdec9e26114ccefd0d36165adf46aa5b6fc88d6f770cc9f797a8dd1b5e85c09d5c'
-
'30558210317307e720fd4d5d360c15882c5c756aad7b26036bc5875a0599312a711df174a87f29d528181ec88e9d48b2ee82456cf23109907c7ba4b4dcc5c238'
-
'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
-validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen
<[email protected]>
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../0001-Skip-broken-tests.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- python -m build --wheel --no-isolation
-}
-
-check() (
- cd $pkgname-$pkgver
- export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
- ./run_tests.py --failfast
-)
-
-package() {
- cd $pkgname-$pkgver
- python -m installer --destdir="$pkgdir" dist/*.whl
-
- install -d "$pkgdir/usr/share/vim/vimfiles"
- 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/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"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: meson/repos/staging-any/PKGBUILD (from rev 473846, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-10 23:42:12 UTC (rev 473847)
@@ -0,0 +1,117 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="High productivity build system"
+url="https://mesonbuild.com/";
+arch=(any)
+license=(Apache)
+depends=(
+ ninja
+ python-tqdm
+ python-typing_extensions
+)
+makedepends=(
+ python-build
+ python-installer
+ python-setuptools
+ python-wheel
+)
+checkdepends=(
+ boost
+ clang
+ cmake
+ cuda
+ cython
+ doxygen
+ gcc-fortran
+ gcc-objc
+ git
+ gmock
+ gnustep-base
+ gobject-introspection
+ graphviz
+ gtest
+ gtk-doc
+ gtk-sharp-2
+ gtk3
+ gtkmm3
+ hotdoc
+ itstool
+ java-environment=8
+ ldc
+ libelf
+ libwmf
+ llvm
+ mercurial
+ mono
+ nasm
+ netcdf-fortran
+ openmpi
+ openssh
+ protobuf
+ python-gobject
+ python-pytest-xdist
+ qt5-base
+ qt5-tools
+ rust
+ rust-bindgen
+ sdl2
+ vala
+ valgrind
+ vulkan-validation-layers
+ wxgtk3
+)
+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
+)
+b2sums=('149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e'
+ 'SKIP'
+
'6f8ec9ccee50e8e33c8c289bae0f33887dc998b5753c373afddc050fa2561172f34ec573f701ed1c5c1715fabcaec2daf5d1979709546816a3813396f34178d5'
+
'afc89e9f7c8c0af12ab86c7030c17d045eb1b0758ea813d86fc88f83963795a6a9abe9a45e11829f15f5c7daf49fcc0238c31881060d16e2a0e93197f9215e1d'
+
'742e2c16c6c464e939f68ec7f58951836a75a0fc0170ada25826e7dbc7191bd289f66bfe683941a5ff98d102fd54aeda2c407e9d2ab4276cf607a82ab948093b'
+
'801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1')
+validpgpkeys=(
+ 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen
<[email protected]>
+)
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../0001-Skip-broken-tests.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ python -m build --wheel --no-isolation
+}
+
+check() (
+ cd $pkgname-$pkgver
+ export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
+ ./run_tests.py --failfast
+)
+
+package() {
+ cd $pkgname-$pkgver
+ python -m installer --destdir="$pkgdir" dist/*.whl
+
+ install -d "$pkgdir/usr/share/vim/vimfiles"
+ 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/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"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: arch-meson
===================================================================
--- arch-meson 2023-04-10 23:42:01 UTC (rev 473846)
+++ arch-meson 2023-04-10 23:42:12 UTC (rev 473847)
@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-# Highly opinionated wrapper for Arch Linux packaging
-
-exec meson setup \
- --prefix /usr \
- --libexecdir lib \
- --sbindir bin \
- --buildtype plain \
- --auto-features enabled \
- --wrap-mode nodownload \
- -D b_lto=true \
- -D b_pie=true \
- "$@"
Copied: meson/repos/staging-any/arch-meson (from rev 473846,
meson/trunk/arch-meson)
===================================================================
--- arch-meson (rev 0)
+++ arch-meson 2023-04-10 23:42:12 UTC (rev 473847)
@@ -0,0 +1,13 @@
+#!/bin/bash -ex
+# Highly opinionated wrapper for Arch Linux packaging
+
+exec meson setup \
+ --prefix /usr \
+ --libexecdir lib \
+ --sbindir bin \
+ --buildtype plain \
+ --auto-features enabled \
+ --wrap-mode nodownload \
+ -D b_lto=true \
+ -D b_pie=true \
+ "$@"
