Date: Sunday, September 23, 2018 @ 20:10:41 Author: heftig Revision: 335260
0.48.0-1 Modified: meson/trunk/PKGBUILD Deleted: meson/trunk/test.diff -----------+ PKGBUILD | 13 ++++++------- test.diff | 13 ------------- 2 files changed, 6 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-23 19:00:56 UTC (rev 335259) +++ PKGBUILD 2018-09-23 20:10:41 UTC (rev 335260) @@ -3,7 +3,7 @@ # Contributor: Anatol Pomozov <anatol dot pomozov at gmail> pkgname=meson -pkgver=0.47.2 +pkgver=0.48.0 pkgrel=1 pkgdesc='High productivity build system' url='http://mesonbuild.com/' @@ -17,18 +17,17 @@ '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} - arch-meson test.diff) -sha512sums=('a1ac5691a5319ccf196d9443aea61e6c3ee9f09a9f638a3a7b5e5381b4c14372253c845be74fa2b59f42b9697671f12bce92c46bcb5cb629aeebd68e044e0021' + arch-meson) +sha512sums=('33ddb6b36ad6a4d4e7bbc2f9b3c8cab103142b88ed6fcf8c727341ad5339209f183e8fdd0177a28d4394f7635e1127182760ea63c0c6ded3a8d41fe64584ee7c' 'SKIP' - '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d' - '0e537c4fc04535decf901713f05d895dd8b93f2136e463b4a5adc5f2bf3a3e4c4ee07b5936fd7d01309af75a50fb1dc8d842b953c039ffe096efd54fd86aa7d0') + '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d') validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakk...@gmail.com> prepare() { cd ${pkgname}-${pkgver} - # https://github.com/mesonbuild/meson/issues/4083 - patch -Np1 -i ../test.diff + # Succeeds for us? + mv 'test cases/failing/85 gtest dependency with version' 'test cases/frameworks/' } build() { Deleted: test.diff =================================================================== --- test.diff 2018-09-23 19:00:56 UTC (rev 335259) +++ test.diff 2018-09-23 20:10:41 UTC (rev 335260) @@ -1,13 +0,0 @@ -diff --git i/run_unittests.py w/run_unittests.py -index 28264606..7c267e17 100755 ---- i/run_unittests.py -+++ w/run_unittests.py -@@ -3441,7 +3441,7 @@ class LinuxlikeTests(BasePlatformTests): - break - self.assertIsInstance(docbook_target, dict) - ifile = self.introspect(['--target-files', 'generated-gdbus-docbook@cus'])[0] -- self.assertEqual(t['filename'], 'gdbus/generated-gdbus-doc-' + ifile) -+ self.assertEqual(t['filename'], 'gdbus/generated-gdbus-doc-' + os.path.basename(ifile)) - - def test_build_rpath(self): - if is_cygwin():