From 0ac0937039849e4c0582a25b51e0320ce2263c99 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 23 Sep 2018 21:11:22 +0000
Subject: [PATCH] extra/meson to 0.48.0-1

---
 extra/meson/PKGBUILD  | 11 +++++------
 extra/meson/test.diff | 13 -------------
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 extra/meson/test.diff

diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD
index a60095e82..a30e213b2 100644
--- a/extra/meson/PKGBUILD
+++ b/extra/meson/PKGBUILD
@@ -7,7 +7,7 @@
 #  - remove checkdepend on dmd
 
 pkgname=meson
-pkgver=0.47.2
+pkgver=0.48.0
 pkgrel=1
 pkgdesc='High productivity build system'
 url='http://mesonbuild.com/'
@@ -21,18 +21,17 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-b
               'doxygen' 'vulkan-validation-layers' 'openssh' 'mercurial' 'gtk-sharp-2' 'qt5-tools'
               'libwmf' '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'
-            '7ea030fdbaa7147694d5e94dc97b407b372254eb3045b284a64537c66d00947eb073462b6822599133b8ffb8f47dc53026b1f1d1e9a57b66ed3d4c734beba1d4'
             '0e537c4fc04535decf901713f05d895dd8b93f2136e463b4a5adc5f2bf3a3e4c4ee07b5936fd7d01309af75a50fb1dc8d842b953c039ffe096efd54fd86aa7d0')
 validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane@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() {
diff --git a/extra/meson/test.diff b/extra/meson/test.diff
deleted file mode 100644
index d82062656..000000000
--- a/extra/meson/test.diff
+++ /dev/null
@@ -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():