[arch-commits] Commit in meson/repos (3 files)

[Laurent Carlier]

    Date: Tuesday, July 11, 2017 @ 11:24:34
  Author: lcarlier
Revision: 300092

archrelease: copy trunk to testing-any

Added:
  meson/repos/testing-any/
  meson/repos/testing-any/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch
    (from rev 300091, meson/trunk/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch)
  meson/repos/testing-any/PKGBUILD
    (from rev 300091, meson/trunk/PKGBUILD)

------------------------------------------------------+
 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch |   32 +++++++++
 PKGBUILD                                             |   57 +++++++++++++++++
 2 files changed, 89 insertions(+)

Copied: meson/repos/testing-any/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch (from rev 300091, meson/trunk/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch)
===================================================================
--- testing-any/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch	                        (rev 0)
+++ testing-any/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch	2017-07-11 11:24:34 UTC (rev 300092)
@@ -0,0 +1,32 @@
+From 8dcdaede56a1d608a029576d9204ddef6018d798 Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Tue, 11 Jul 2017 12:44:59 +0200
+Subject: [PATCH] pkgconfig: avoid appending slash at Cflags
+
+otherwise it can break some compilations, see https://bugs.archlinux.org/task/54763
+---
+ mesonbuild/modules/pkgconfig.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
+index 09c615ab..d662742f 100644
+--- a/mesonbuild/modules/pkgconfig.py
++++ b/mesonbuild/modules/pkgconfig.py
+@@ -96,10 +96,11 @@ class PkgConfigModule(ExtensionModule):
+                 ofile.write('Libs.private: {}\n'.format(' '.join(generate_libs_flags(priv_libs))))
+             ofile.write('Cflags:')
+             for h in subdirs:
+-                if h == '.':
+-                    h = ''
+                 ofile.write(' ')
+-                ofile.write(os.path.join('-I${includedir}', h))
++                if h == '.':
++                    ofile.write('-I${includedir}')
++                else:
++                    ofile.write(os.path.join('-I${includedir}', h))
+             ofile.write('\n')
+ 
+     def process_libs(self, libs):
+-- 
+2.13.2
+

Copied: meson/repos/testing-any/PKGBUILD (from rev 300091, meson/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2017-07-11 11:24:34 UTC (rev 300092)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+
+pkgname=meson
+pkgver=0.41.1+8+g1be77026
+pkgrel=2
+pkgdesc='High productivity build system'
+url='http://mesonbuild.com/'
+arch=('any')
+license=('Apache')
+depends=('python' 'ninja')
+makedepends=('python-setuptools' 'git')
+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' 'ldc' 'java-environment>=8' 'gtk-doc' 'llvm' 'clang' 'sdl2'
+              'doxygen')
+_commit=1be77026373469ce4d71650adbba236df031a9f4  # 0.41
+source=("git+https://github.com/mesonbuild/meson#commit=$_commit"
+        0001-pkgconfig-avoid-appending-slash-at-Cflags.patch)
+sha512sums=('SKIP'
+            'ed7a147cb353981c1558bbb3d870f42e214b3ee0d33366ec8f289479bcbfed467183f6398fb6ab3091f2ff334f17943da22985cc500ee0b25d5ffee99726b85f')
+validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  # fix FS#54763
+  patch -Np1 -i ../0001-pkgconfig-avoid-appending-slash-at-Cflags.patch
+}
+
+build() {
+  cd $pkgname
+  python setup.py build
+}
+
+check() {
+  cd $pkgname
+  unset CLASSPATH  # GNUstep breaks java tests
+  # Installing graphviz breaks doxygen tests
+  LC_CTYPE=en_US.UTF-8 DC=ldc ./run_tests.py
+}
+
+package() {
+  cd $pkgname
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 syntax-highlighting/vim/ftdetect/meson.vim -t "${pkgdir}/usr/share/vim/vimfiles/ftdetect"
+  install -Dm 644 syntax-highlighting/vim/indent/meson.vim -t "${pkgdir}/usr/share/vim/vimfiles/indent"
+  install -Dm 644 syntax-highlighting/vim/syntax/meson.vim -t "${pkgdir}/usr/share/vim/vimfiles/syntax"
+}
+
+# vim: ts=2 sw=2 et: