3 files changed, 18 insertions, 52 deletions
diff --git a/abs/extra/meson/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch b/abs/extra/meson/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
deleted file mode 100644
index 973912b..0000000
--- a/abs/extra/meson/0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 89d4decc9cdda01590c2a734c0f58924bcf30777 Mon Sep 17 00:00:00 2001
-Message-Id: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steffens@gmail.com>
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Tue, 19 Dec 2017 20:05:24 -0800
-Subject: [PATCH 1/2] tests: skip objc nsstring test if gnustep is not
- installed
-
----
- test cases/objc/2 nsstring/meson.build | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build
-index a877d746..7f2483f4 100644
---- a/test cases/objc/2 nsstring/meson.build	
-+++ b/test cases/objc/2 nsstring/meson.build	
-@@ -5,7 +5,10 @@ if host_machine.system() == 'darwin'
- elif host_machine.system() == 'cygwin'
-   error('MESON_SKIP_TEST GNUstep is not packaged for Cygwin.')
- else
--  dep = dependency('gnustep')
-+  dep = dependency('gnustep', required : false)
-+  if not dep.found()
-+    error('MESON_SKIP_TEST: GNUstep is not installed')
-+  endif
-   if host_machine.system() == 'linux' and meson.get_compiler('objc').get_id() == 'clang'
-     error('MESON_SKIP_TEST: GNUstep is broken on Linux with Clang')
-   endif
--- 
-2.16.1
-
diff --git a/abs/extra/meson/PKGBUILD b/abs/extra/meson/PKGBUILD
index 4f93834..b3aef04 100644
--- a/abs/extra/meson/PKGBUILD
+++ b/abs/extra/meson/PKGBUILD
@@ -3,33 +3,30 @@
 # Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
 
 pkgname=meson
-pkgver=0.44.1
+pkgver=0.49.1
 pkgrel=1
 pkgdesc='High productivity build system'
 url='http://mesonbuild.com/'
 arch=('any')
 license=('Apache')
-depends=('python' 'ninja')
-makedepends=('python-setuptools')
-checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git'
-              'cython' 'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
+depends=('python-setuptools' 'ninja')
+checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt4' 'qt5-base' 'git' 'cython'
+              'gtkmm3' 'gtest' 'gmock' 'protobuf' 'wxgtk' 'python-gobject' 'gobject-introspection'
               'itstool' 'gtk3' 'java-environment=8' 'gtk-doc' 'llvm' 'clang' 'sdl2' 'graphviz'
-              'doxygen' 'vulkan-validation-layers' 'openmpi' 'openssh' 'mercurial' 'gtk-sharp-2'
-              'qt5-tools' 'libwmf' 'dmd' 'valgrind')
+              '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}
-        0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
         arch-meson)
-sha512sums=('1ecccccfa24ec2c5c144f8c13fd95d250b59cb22b79676a2a1a6f9ed30a7b08adb71d5882b2d4421d07689ad6dd6d6aef139ac33f628e55a1d428cbc40b4d93e'
+sha512sums=('2a9a3d1e1eae3f9f21f47c0efb2ecd78861a71109fa5a660bf6403df2d5bd5c31fa2ef848080ca72d25257836b9e00e2fb89d5fc281647600ece0179c703cfe8'
             'SKIP'
-            '04a0f113ba5f1ae57591fad3f5ecf812ef88b8809b4ffe063e82f6548e728a1a7bd51c171a948873884c2631fc10a9cd141f56de22cd7cf766cdb74996840eec'
-            'e901f87f3ee1baa7b9aedb79bd5c9e50898a5695ac938f7f8420d8e81f526a09f07ceedadb65975437efa5a68fcf581110a040f579f2530437d1e6eb5addea76')
+            'f2a5e0f331a5ccf25fc8a440472548fedde9dbf4d562ec13baf502cf549d6ed35d61933dedeb8fafef261a28d4b568e897a004d435475e73dc0ed6d3427ba5b7')
 validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane@gmail.com>
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
-  # Skip gnustep tests
-  patch -Np1 -i ../0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch
+  # Succeeds for us?
+  mv 'test cases/failing/85 gtest dependency with version' 'test cases/frameworks/'
 }
 
 build() {
@@ -40,9 +37,6 @@ build() {
 check() (
   cd ${pkgname}-${pkgver}
 
-  # --as-needed breaks openmpi linking
-  LDFLAGS="${LDFLAGS/,--as-needed/}"
-
   # set for debug output
   #export MESON_PRINT_TEST_OUTPUT=1
 
@@ -54,9 +48,9 @@ package() {
   cd ${pkgname}-${pkgver}
   python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 
-  for _f in data/syntax-highlighting/vim/*/*; do
-    install -Dt "${pkgdir}/usr/share/vim/vimfiles/$(basename "$(dirname "$_f")")" -m644 "$_f"
-  done
+  install -d "${pkgdir}/usr/share/vim/vimfiles"
+  cp -rt "${pkgdir}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/
+
   install -Dt "${pkgdir}/usr/share/emacs/site-lisp" -m644 data/syntax-highlighting/emacs/*
   install -Dt "${pkgdir}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/*
 
diff --git a/abs/extra/meson/arch-meson b/abs/extra/meson/arch-meson
index c4a9e7c..88af9d4 100644
--- a/abs/extra/meson/arch-meson
+++ b/abs/extra/meson/arch-meson
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
-# Meson wrapper for Arch Linux packaging
+# Highly opinionated wrapper for Arch Linux packaging
 
 exec meson setup \
   --prefix         /usr \
@@ -16,6 +16,8 @@ exec meson setup \
   --localstatedir  /var \
   --sharedstatedir /var/lib \
   --buildtype      release \
+  --auto-features  enabled \
   --wrap-mode      nofallback \
-  "$@" \
-  -D               b_lto=true
+  -D               b_lto=true \
+  -D               b_pie=true \
+  "$@"