Date: Sunday, October 24, 2021 @ 18:25:41 Author: heftig Revision: 426505
0.60.0-1: return to git to pass check Modified: meson/trunk/PKGBUILD meson/trunk/skip-test.diff ----------------+ PKGBUILD | 26 ++++++++++++++++---------- skip-test.diff | 28 ++++++++++++++++++---------- 2 files changed, 34 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-24 18:22:23 UTC (rev 426504) +++ PKGBUILD 2021-10-24 18:25:41 UTC (rev 426505) @@ -3,7 +3,7 @@ # Contributor: Anatol Pomozov <anatol dot pomozov at gmail> pkgname=meson -pkgver=0.59.3 +pkgver=0.60.0 pkgrel=1 pkgdesc='High productivity build system' url='https://mesonbuild.com/' @@ -10,6 +10,7 @@ arch=('any') license=('Apache') depends=('python-setuptools' 'ninja') +makedepends=('git') checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' 'git' 'cython' 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk3' 'python-gobject' 'gobject-introspection' 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz' @@ -16,35 +17,40 @@ 'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools' 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'nasm' 'gnustep-base' 'libelf' 'python-pytest-xdist' 'python2-setuptools' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc') -source=(https://github.com/mesonbuild/meson/releases/download/${pkgver/rc/.rc}/meson-${pkgver}.tar.gz{,.asc} +_commit=f64e5cee6bc7ab8c00c31f341afc6043867773d0 # tags/0.60.0^0 +source=("git+https://github.com/mesonbuild/meson#commit=$_commit" skip-test.diff arch-meson) -sha512sums=('4ffca094474c09567a69f576b25588c38e18d3a96d0b1d592adb05493a5d6dcfcd1a6549a821862a5aabd3df34d81b3a90d01e012e62c7f46bd98152337c0ea6' - 'SKIP' - 'c00c3bbb6f6dfe41bb6e05e3eba94fb177f3ef9353bc132e33e54eabacc14d81ed7bff5fe965fb4d49ce8a586a7ebb887b625174f272a48b2f3c85d3288e23b1' +sha512sums=('SKIP' + '486e60b1d470c64d07d4686bd0b4374924967b9e024ff6d9fe248f512995ece19b8b09dd69c91f26dec4bb92c61fc3d275a2b7e481c2acd10ebb90d7e3cb7e20' 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c') validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakk...@gmail.com> +pkgver() { + cd ${pkgname} + git describe --tags | sed 's/-/+/g' +} + prepare() { - cd ${pkgname}-${pkgver} + cd ${pkgname} # Our containers do not allow sanitizers to run - patch -Np1 -i ../skip-test.diff + git apply -3 ../skip-test.diff } build() { - cd ${pkgname}-${pkgver} + cd ${pkgname} python setup.py build } check() ( - cd ${pkgname}-${pkgver} + cd ${pkgname} export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS= ./run_tests.py ) package() { - cd ${pkgname}-${pkgver} + cd ${pkgname} python setup.py install --root="${pkgdir}" --optimize=1 --skip-build install -d "${pkgdir}/usr/share/vim/vimfiles" Modified: skip-test.diff =================================================================== --- skip-test.diff 2021-10-24 18:22:23 UTC (rev 426504) +++ skip-test.diff 2021-10-24 18:25:41 UTC (rev 426505) @@ -1,15 +1,23 @@ - run_unittests.py | 1 + - 1 file changed, 1 insertion(+) + unittests/linuxliketests.py | 2 ++ + 1 file changed, 2 insertions(+) -diff --git c/run_unittests.py i/run_unittests.py -index 15312731c..f9a0e494f 100755 ---- c/run_unittests.py -+++ i/run_unittests.py -@@ -7101,6 +7101,7 @@ class LinuxlikeTests(BasePlatformTests): - raise unittest.SkipTest('asan not available on Cygwin') +diff --git c/unittests/linuxliketests.py i/unittests/linuxliketests.py +index 81cca06dd..88b49b63e 100644 +--- c/unittests/linuxliketests.py ++++ i/unittests/linuxliketests.py +@@ -343,6 +343,7 @@ class LinuxlikeTests(BasePlatformTests): + raise SkipTest('asan not available on Cygwin') if is_openbsd(): - raise unittest.SkipTest('-fsanitize=address is not supported on OpenBSD') -+ raise unittest.SkipTest('cannot run sanitizers in containers without ptrace') + 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']) +@@ -974,6 +975,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'])