Date: Friday, May 15, 2020 @ 20:19:53 Author: heftig Revision: 383729
archrelease: copy trunk to extra-any Added: meson/repos/extra-any/PKGBUILD (from rev 383728, meson/trunk/PKGBUILD) meson/repos/extra-any/arch-meson (from rev 383728, meson/trunk/arch-meson) meson/repos/extra-any/skip-test.diff (from rev 383728, meson/trunk/skip-test.diff) Deleted: meson/repos/extra-any/0001-Fix-meson_jar_template-so-test-suite-passes.patch meson/repos/extra-any/PKGBUILD meson/repos/extra-any/arch-meson meson/repos/extra-any/skip-test.diff --------------------------------------------------------+ 0001-Fix-meson_jar_template-so-test-suite-passes.patch | 88 ---------- PKGBUILD | 127 +++++++-------- arch-meson | 26 +-- skip-test.diff | 24 +- 4 files changed, 86 insertions(+), 179 deletions(-) Deleted: 0001-Fix-meson_jar_template-so-test-suite-passes.patch =================================================================== --- 0001-Fix-meson_jar_template-so-test-suite-passes.patch 2020-05-15 20:19:37 UTC (rev 383728) +++ 0001-Fix-meson_jar_template-so-test-suite-passes.patch 2020-05-15 20:19:53 UTC (rev 383729) @@ -1,88 +0,0 @@ -From f61bab556a2cf6aae7935f6add8b00657666b5e2 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 30 Mar 2020 01:27:39 +0200 -Subject: [PATCH] Fix meson_jar_template so test suite passes - -It was generating an extra comma. - - The Meson build system - Version: 0.54.0 - Source dir: /tmp/tmp34halxhe - Build dir: /tmp/tmp34halxhe/build - Build type: native build - - meson.build:6:15: ERROR: Expecting rparen got comma. - 'Foo.java',, - ^ - For a block that started at 5,3 - jar('tmp34halxhe', - ^ - - A full log can be found at /tmp/tmp34halxhe/build/meson-logs/meson-log.txt - Using "tmp34halxhe" (name of current directory) as project name. - Using "tmp34halxhe" (project name) as name of executable to build. - Detected source files: Foo.java - Detected language: java - Generated meson.build file: - - project('tmp34halxhe', 'java', - version : '0.1', - default_options : ['warning_level=3']) - - jar('tmp34halxhe', - 'Foo.java',, - main_class: tmp34halxhe, - install : true) - -It was also missing quotes around the main class name. - - The Meson build system - Version: 0.54.0 - Source dir: /tmp/tmpjm5cg44a - Build dir: /tmp/tmpjm5cg44a/build - Build type: native build - Project name: tmpjm5cg44a - Project version: 0.1 - Java compiler for the host machine: javac (unknown 1.8.0) - Host machine cpu family: x86_64 - Host machine cpu: x86_64 - - meson.build:5:0: ERROR: Unknown variable "tmpjm5cg44a". - - A full log can be found at /tmp/tmpjm5cg44a/build/meson-logs/meson-log.txt - Using "tmpjm5cg44a" (name of current directory) as project name. - Using "tmpjm5cg44a" (project name) as name of executable to build. - Detected source files: Foo.java - Detected language: java - Generated meson.build file: - - project('tmpjm5cg44a', 'java', - version : '0.1', - default_options : ['warning_level=3']) - - jar('tmpjm5cg44a', - 'Foo.java', - main_class: tmpjm5cg44a, - install : true) ---- - mesonbuild/templates/mesontemplates.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py -index 2739c9d8..6b341a21 100644 ---- a/mesonbuild/templates/mesontemplates.py -+++ b/mesonbuild/templates/mesontemplates.py -@@ -27,8 +27,8 @@ meson_jar_template = '''project('{project_name}', '{language}', - default_options : [{default_options}]) - - jar('{executable}', -- {sourcespec},{depspec}, -- main_class: {main_class}, -+ {sourcespec},{depspec} -+ main_class: '{main_class}', - install : true) - ''' - --- -2.26.0 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-15 20:19:37 UTC (rev 383728) +++ PKGBUILD 2020-05-15 20:19:53 UTC (rev 383729) @@ -1,66 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor: Anatol Pomozov <anatol dot pomozov at gmail> - -pkgname=meson -pkgver=0.54.1 -pkgrel=1 -pkgdesc='High productivity build system' -url='https://mesonbuild.com/' -arch=('any') -license=('Apache') -depends=('python-setuptools' 'ninja') -checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' 'git' 'cython' - 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection' - 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz' - 'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools' - 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'nasm' 'gnustep-base' 'libelf' - 'python-pytest-xdist') # 'cuda') -source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} - skip-test.diff - 0001-Fix-meson_jar_template-so-test-suite-passes.patch - arch-meson) -sha512sums=('dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe' - 'SKIP' - 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347' - '1203c844466409fceb6e3bd4f419762d7dcd460f4dbf412eda7d966b002dd69710af97d9135fc399c71fdcd191aa512bf180e60562f5996932e2827acf591eb2' - 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c') -validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakk...@gmail.com> - -prepare() { - cd ${pkgname}-${pkgver} - - # Our containers do not allow sanitizers to run - patch -Np1 -i ../skip-test.diff - - # https://github.com/mesonbuild/meson/pull/6868 - patch -Np1 -i ../0001-Fix-meson_jar_template-so-test-suite-passes.patch -} - -build() { - cd ${pkgname}-${pkgver} - python setup.py build -} - -check() ( - cd ${pkgname}-${pkgver} - export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS= - ./run_tests.py -) - -package() { - cd ${pkgname}-${pkgver} - python setup.py install --root="${pkgdir}" --optimize=1 --skip-build - - install -d "${pkgdir}/usr/share/vim/vimfiles" - cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/ - - install -Dt "${pkgdir}/usr/share/bash-completion/completions" -m644 data/shell-completions/bash/* - install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/* - install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/* - - # Arch packaging helper - install -D ../arch-meson -t "${pkgdir}/usr/bin" -} - -# vim: ts=2 sw=2 et: Copied: meson/repos/extra-any/PKGBUILD (from rev 383728, meson/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-15 20:19:53 UTC (rev 383729) @@ -0,0 +1,61 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Anatol Pomozov <anatol dot pomozov at gmail> + +pkgname=meson +pkgver=0.54.2 +pkgrel=1 +pkgdesc='High productivity build system' +url='https://mesonbuild.com/' +arch=('any') +license=('Apache') +depends=('python-setuptools' 'ninja') +checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' 'git' 'cython' + 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection' + 'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz' + 'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools' + 'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'nasm' 'gnustep-base' 'libelf' + 'python-pytest-xdist') # 'cuda') +source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} + skip-test.diff + arch-meson) +sha512sums=('ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed' + 'SKIP' + 'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347' + 'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c') +validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakk...@gmail.com> + +prepare() { + cd ${pkgname}-${pkgver} + + # Our containers do not allow sanitizers to run + patch -Np1 -i ../skip-test.diff +} + +build() { + cd ${pkgname}-${pkgver} + python setup.py build +} + +check() ( + cd ${pkgname}-${pkgver} + export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS= + ./run_tests.py +) + +package() { + cd ${pkgname}-${pkgver} + python setup.py install --root="${pkgdir}" --optimize=1 --skip-build + + install -d "${pkgdir}/usr/share/vim/vimfiles" + cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/ + + install -Dt "${pkgdir}/usr/share/bash-completion/completions" -m644 data/shell-completions/bash/* + install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/* + install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/* + + # Arch packaging helper + install -D ../arch-meson -t "${pkgdir}/usr/bin" +} + +# vim: ts=2 sw=2 et: Deleted: arch-meson =================================================================== --- arch-meson 2020-05-15 20:19:37 UTC (rev 383728) +++ arch-meson 2020-05-15 20:19:53 UTC (rev 383729) @@ -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/extra-any/arch-meson (from rev 383728, meson/trunk/arch-meson) =================================================================== --- arch-meson (rev 0) +++ arch-meson 2020-05-15 20:19:53 UTC (rev 383729) @@ -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 \ + "$@" Deleted: skip-test.diff =================================================================== --- skip-test.diff 2020-05-15 20:19:37 UTC (rev 383728) +++ skip-test.diff 2020-05-15 20:19:53 UTC (rev 383729) @@ -1,12 +0,0 @@ -diff --git i/run_unittests.py w/run_unittests.py -index 90d4a628..f83bd61f 100755 ---- i/run_unittests.py -+++ w/run_unittests.py -@@ -4368,6 +4368,7 @@ class LinuxlikeTests(BasePlatformTests): - raise unittest.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') - - testdir = os.path.join(self.framework_test_dir, '7 gnome') - self.init(testdir, ['-Db_sanitize=address', '-Db_lundef=false']) Copied: meson/repos/extra-any/skip-test.diff (from rev 383728, meson/trunk/skip-test.diff) =================================================================== --- skip-test.diff (rev 0) +++ skip-test.diff 2020-05-15 20:19:53 UTC (rev 383729) @@ -0,0 +1,12 @@ +diff --git i/run_unittests.py w/run_unittests.py +index 90d4a628..f83bd61f 100755 +--- i/run_unittests.py ++++ w/run_unittests.py +@@ -4368,6 +4368,7 @@ class LinuxlikeTests(BasePlatformTests): + raise unittest.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') + + testdir = os.path.join(self.framework_test_dir, '7 gnome') + self.init(testdir, ['-Db_sanitize=address', '-Db_lundef=false'])