[arch-commits] Commit in meson/repos/extra-any (6 files)

Jan Steffens heftig at archlinux.org
Fri Apr 19 18:52:08 UTC 2019


    Date: Friday, April 19, 2019 @ 18:52:07
  Author: heftig
Revision: 350902

archrelease: copy trunk to extra-any

Added:
  meson/repos/extra-any/0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
    (from rev 350901, meson/trunk/0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch)
  meson/repos/extra-any/PKGBUILD
    (from rev 350901, meson/trunk/PKGBUILD)
  meson/repos/extra-any/arch-meson
    (from rev 350901, meson/trunk/arch-meson)
Deleted:
  meson/repos/extra-any/4878.patch
  meson/repos/extra-any/PKGBUILD
  meson/repos/extra-any/arch-meson

-----------------------------------------------------------------+
 0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch |   26 ++
 4878.patch                                                      |   26 --
 PKGBUILD                                                        |  130 ++++------
 arch-meson                                                      |   26 +-
 4 files changed, 103 insertions(+), 105 deletions(-)

Copied: meson/repos/extra-any/0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch (from rev 350901, meson/trunk/0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch)
===================================================================
--- 0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch	                        (rev 0)
+++ 0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch	2019-04-19 18:52:07 UTC (rev 350902)
@@ -0,0 +1,26 @@
+From ff477d2b3f5ddc582140e6d357e52f1cb1da74ce Mon Sep 17 00:00:00 2001
+Message-Id: <ff477d2b3f5ddc582140e6d357e52f1cb1da74ce.1555699269.git.jan.steffens at gmail.com>
+From: Jon Turney <jon.turney at dronecode.org.uk>
+Date: Sat, 30 Mar 2019 18:35:00 +0000
+Subject: [PATCH] Fix 'failing/85 gtest dependency with version' test to fail
+ on Arch
+
+If gtest is patched to have a pkg-config file, that will report the
+version, so force the 'system' method to be used when we are exercising
+that an unknown version doesn't satisfy any version constraint.
+---
+ test cases/failing/85 gtest dependency with version/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test cases/failing/85 gtest dependency with version/meson.build b/test cases/failing/85 gtest dependency with version/meson.build
+index 5115f279..3d909942 100644
+--- a/test cases/failing/85 gtest dependency with version/meson.build	
++++ b/test cases/failing/85 gtest dependency with version/meson.build	
+@@ -1,3 +1,3 @@
+ project('gtest dependency with version', ['c', 'cpp'])
+ # discovering gtest version is not yet implemented
+-dep = dependency('gtest', version: '>0')
++dep = dependency('gtest', method: 'system', version: '>0')
+-- 
+2.21.0
+

Deleted: 4878.patch
===================================================================
--- 4878.patch	2019-04-19 18:51:58 UTC (rev 350901)
+++ 4878.patch	2019-04-19 18:52:07 UTC (rev 350902)
@@ -1,26 +0,0 @@
-From c5544aea8d8480262b9792ac85b8e61d1fb08f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel at collabora.com>
-Date: Mon, 4 Feb 2019 13:49:01 +0100
-Subject: [PATCH] vala: Support position-independent executables
-
----
- mesonbuild/compilers/vala.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
-index e64d57f366..5303298a62 100644
---- a/mesonbuild/compilers/vala.py
-+++ b/mesonbuild/compilers/vala.py
-@@ -49,6 +49,12 @@ def get_compile_only_args(self):
-     def get_pic_args(self):
-         return []
- 
-+    def get_pie_args(self):
-+        return []
-+
-+    def get_pie_link_args(self):
-+        return []
-+
-     def get_always_args(self):
-         return ['-C']
- 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 18:51:58 UTC (rev 350901)
+++ PKGBUILD	2019-04-19 18:52:07 UTC (rev 350902)
@@ -1,66 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
-
-pkgname=meson
-pkgver=0.49.2
-pkgrel=2
-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' 'qt4' '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' 'dmd' 'valgrind')
-source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
-        4878.patch
-        arch-meson)
-sha512sums=('d07a5dfd699f1e4b00af39c377ec186c91718d9595cb0ab506b4b40c0c63ddd14eccbe8afb446635272c431e2a78032888be0bc8f6064044da53e8c0b5f7be3f'
-            'SKIP'
-            'ff1326c7b56da98eab615b40e07cba86d6ceee18d29e8b5c57ccf73980a7a466c8e5695cc0b96a36330cd0d51e52b8fed08456ebea6763edb736ae7116be2f4b'
-            'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
-validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # https://github.com/mesonbuild/meson/issues/4884
-  patch -Np1 -i ../4878.patch
-
-  # Succeeds for us?
-  mv 'test cases/failing/85 gtest dependency with version' 'test cases/frameworks/'
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  python setup.py build
-}
-
-check() (
-  cd ${pkgname}-${pkgver}
-
-  # set for debug output
-  #export MESON_PRINT_TEST_OUTPUT=1
-
-  export LC_CTYPE=en_US.UTF-8
-  ./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/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 350901, meson/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-19 18:52:07 UTC (rev 350902)
@@ -0,0 +1,64 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=0.50.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' 'qt4' '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' 'dmd' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'cuda' 'ldc' 'nasm'
+              'gnustep-base' 'libelf')
+source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
+        0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
+        arch-meson)
+sha512sums=('1e3dda7684e999b408a34b4b594f0b7d22494328dc0e98ec794625f16d821f2ef96303ffc761a52249e3919b52befe9fc02577dbd52e50f4b16e6c0f79ba2fca'
+            'SKIP'
+            '41e305af419076077d3e47e57c9aa3757bf4936cb5533976fc7b06e3c09c3750f355290b14d47f37b6c7b3a403f6d0ddbf67203092441b485481a9adb7ea671e'
+            'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
+validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Fix expected-fail test to actually fail
+  patch -Np1 -i ../0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  python setup.py build
+}
+
+check() (
+  cd ${pkgname}-${pkgver}
+
+  # set for debug output
+  #export MESON_PRINT_TEST_OUTPUT=1
+
+  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/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	2019-04-19 18:51:58 UTC (rev 350901)
+++ arch-meson	2019-04-19 18:52:07 UTC (rev 350902)
@@ -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 350901, meson/trunk/arch-meson)
===================================================================
--- arch-meson	                        (rev 0)
+++ arch-meson	2019-04-19 18:52:07 UTC (rev 350902)
@@ -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 \
+  "$@"


More information about the arch-commits mailing list