[arch-commits] Commit in meson/trunk (PKGBUILD test.diff)

Jan Steffens heftig at archlinux.org
Sat Aug 25 21:27:43 UTC 2018


    Date: Saturday, August 25, 2018 @ 21:27:43
  Author: heftig
Revision: 333014

0.47.2-1

Added:
  meson/trunk/test.diff
Modified:
  meson/trunk/PKGBUILD

-----------+
 PKGBUILD  |   14 +++++++++-----
 test.diff |   13 +++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-25 19:59:11 UTC (rev 333013)
+++ PKGBUILD	2018-08-25 21:27:43 UTC (rev 333014)
@@ -3,8 +3,8 @@
 # Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
 
 pkgname=meson
-pkgver=0.47.1
-pkgrel=2
+pkgver=0.47.2
+pkgrel=1
 pkgdesc='High productivity build system'
 url='http://mesonbuild.com/'
 arch=('any')
@@ -17,14 +17,18 @@
               '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)
-sha512sums=('b86a95a057cfe3b46a33dfe57d0b215133306808871cd2d0f479421b7fd7ce7f5b49aa4c1d429ac0a1a56f805e1c690d220b567b8118e875b140dc75ad8218a5'
+        arch-meson test.diff)
+sha512sums=('a1ac5691a5319ccf196d9443aea61e6c3ee9f09a9f638a3a7b5e5381b4c14372253c845be74fa2b59f42b9697671f12bce92c46bcb5cb629aeebd68e044e0021'
             'SKIP'
-            '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d')
+            '4cdacd6a7d2bdaacde176fd7f90f8a06ae403db7e63498518c637b13bdc344dca595fb8b9f41f978f450cd43ffef8a4013c0e74f669d13ba6881d38068ea1c0d'
+            '0e537c4fc04535decf901713f05d895dd8b93f2136e463b4a5adc5f2bf3a3e4c4ee07b5936fd7d01309af75a50fb1dc8d842b953c039ffe096efd54fd86aa7d0')
 validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
 
 prepare() {
   cd ${pkgname}-${pkgver}
+
+  # https://github.com/mesonbuild/meson/issues/4083
+  patch -Np1 -i ../test.diff
 }
 
 build() {

Added: test.diff
===================================================================
--- test.diff	                        (rev 0)
+++ test.diff	2018-08-25 21:27:43 UTC (rev 333014)
@@ -0,0 +1,13 @@
+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 at 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():



More information about the arch-commits mailing list