[arch-commits] Commit in meson/trunk (3 files)

[Jan Steffens]

    Date: Friday, April 19, 2019 @ 18:51:58
  Author: heftig
Revision: 350901

0.50.1-1

Added:
  meson/trunk/0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
Modified:
  meson/trunk/PKGBUILD
Deleted:
  meson/trunk/4878.patch

-----------------------------------------------------------------+
 0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch |   26 ++++++++++
 4878.patch                                                      |   26 ----------
 PKGBUILD                                                        |   22 +++-----
 3 files changed, 36 insertions(+), 38 deletions(-)

Added: 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:51:58 UTC (rev 350901)
@@ -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:39:14 UTC (rev 350900)
+++ 4878.patch	2019-04-19 18:51:58 UTC (rev 350901)
@@ -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']
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 18:39:14 UTC (rev 350900)
+++ PKGBUILD	2019-04-19 18:51:58 UTC (rev 350901)
@@ -3,8 +3,8 @@
 # Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
 
 pkgname=meson
-pkgver=0.49.2
-pkgrel=2
+pkgver=0.50.1
+pkgrel=1
 pkgdesc='High productivity build system'
 url='https://mesonbuild.com/'
 arch=('any')
@@ -14,13 +14,14 @@
               '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')
+              '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}
-        4878.patch
+        0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
         arch-meson)
-sha512sums=('d07a5dfd699f1e4b00af39c377ec186c91718d9595cb0ab506b4b40c0c63ddd14eccbe8afb446635272c431e2a78032888be0bc8f6064044da53e8c0b5f7be3f'
+sha512sums=('1e3dda7684e999b408a34b4b594f0b7d22494328dc0e98ec794625f16d821f2ef96303ffc761a52249e3919b52befe9fc02577dbd52e50f4b16e6c0f79ba2fca'
             'SKIP'
-            'ff1326c7b56da98eab615b40e07cba86d6ceee18d29e8b5c57ccf73980a7a466c8e5695cc0b96a36330cd0d51e52b8fed08456ebea6763edb736ae7116be2f4b'
+            '41e305af419076077d3e47e57c9aa3757bf4936cb5533976fc7b06e3c09c3750f355290b14d47f37b6c7b3a403f6d0ddbf67203092441b485481a9adb7ea671e'
             'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
 validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
 
@@ -27,11 +28,8 @@
 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/'
+  # Fix expected-fail test to actually fail
+  patch -Np1 -i ../0001-Fix-failing-85-gtest-dependency-with-version-test-to.patch
 }
 
 build() {
@@ -45,7 +43,7 @@
   # set for debug output
   #export MESON_PRINT_TEST_OUTPUT=1
 
-  export LC_CTYPE=en_US.UTF-8
+  export LC_CTYPE=en_US.UTF-8 CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
   ./run_tests.py
 )