Date: Sunday, October 8, 2017 @ 22:14:00 Author: heftig Revision: 307208
0.43.0-1 Added: meson/trunk/fix-tests.diff Modified: meson/trunk/PKGBUILD ----------------+ PKGBUILD | 17 ++++++++++++----- fix-tests.diff | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-08 21:57:35 UTC (rev 307207) +++ PKGBUILD 2017-10-08 22:14:00 UTC (rev 307208) @@ -3,8 +3,8 @@ # Contributor: Anatol Pomozov <anatol dot pomozov at gmail> pkgname=meson -pkgver=0.42.1 -pkgrel=3 +pkgver=0.43.0 +pkgrel=1 pkgdesc='High productivity build system' url='http://mesonbuild.com/' arch=('any') @@ -13,16 +13,23 @@ makedepends=('python-setuptools') checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git' 'gnustep-base' 'cython' 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection' - 'itstool' 'gtk3' 'valgrind' 'java-environment>=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' - 'doxygen' 'vulkan-validation-layers' 'openmpi' 'openssh' 'mercurial') + 'itstool' 'gtk3' 'valgrind' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' + 'doxygen' 'vulkan-validation-layers' 'openmpi' 'openssh' 'mercurial' 'gtk-sharp-2') checkdepends_x86_64=('ldc') source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} + fix-tests.diff arch-meson) -sha512sums=('f9982a19160c51c53741a65a48432896799be90c2d99941a45a14c3fcc14df3469808b75d905e1ac81221b057400913e7ae0f7d24e6865d8f1e664e1686aecb4' +sha512sums=('e149758fa6ad4b2d3643bcda176577633f2e50e58f38074c1a17f1712d554bac0fbabf26fe7eef15954dc51630b1f923b15cfe9040a025cf61b5666098197d16' 'SKIP' + '7ea1f02adf79e4fde5d002956852d9b976b36386be8d78a3845292e8195a36d462db20a9c708e332e0d3b261a7abf9d05f5d034aab96ede58229639f3620ec91' '3ad7599e491548e76166a333f1312b871858d9e2d2d2d51a50142f094e5052eb2af199a68acc03c98788e99fc6673e53a1769df9c3e79e0f926d4939d370775a') validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakk...@gmail.com> +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../fix-tests.diff +} + build() { cd ${pkgname}-${pkgver} python setup.py build Added: fix-tests.diff =================================================================== --- fix-tests.diff (rev 0) +++ fix-tests.diff 2017-10-08 22:14:00 UTC (rev 307208) @@ -0,0 +1,33 @@ +diff --git i/test cases/frameworks/15 llvm/meson.build w/test cases/frameworks/15 llvm/meson.build +index 468094ad4f3a5256..a8cf8f22f4fafb24 100644 +--- i/test cases/frameworks/15 llvm/meson.build ++++ w/test cases/frameworks/15 llvm/meson.build +@@ -17,5 +17,5 @@ executable('sum', 'sum.c', dependencies : [ + llvm_dep, + dependency('zlib'), + meson.get_compiler('c').find_library('dl', required : false), +- dependency('tinfo'), ++ dependency('ncursesw'), + ]) +diff --git i/test cases/frameworks/4 qt/meson.build w/test cases/frameworks/4 qt/meson.build +index c6f108bbcf037e6c..ad9d40478d660546 100644 +--- i/test cases/frameworks/4 qt/meson.build ++++ w/test cases/frameworks/4 qt/meson.build +@@ -71,14 +71,16 @@ foreach qt : ['qt4', 'qt5'] + + test(qt + 'maninclude', qtmaninclude) + ++ if qt == 'qt5' + # building Qt plugins implies to give include path to moc + plugin_includes = include_directories('pluginInterface', 'plugin') + pluginpreprocess = qtmodule.preprocess( + moc_headers : 'plugin/plugin.h', + include_directories : plugin_includes + ) +- plugin = library('plugin', 'plugin/plugin.cpp', pluginpreprocess, ++ plugin = library(qt + 'plugin', 'plugin/plugin.cpp', pluginpreprocess, + include_directories : plugin_includes, + dependencies : qtcore) ++ endif + endif + endforeach