[arch-commits] Commit in meson/trunk (2 files)

[Laurent Carlier]

    Date: Tuesday, July 11, 2017 @ 11:24:28
  Author: lcarlier
Revision: 300091

upgpkg: meson 0.41.1+8+g1be77026-2

Fix FS#54763

Added:
  meson/trunk/0001-pkgconfig-avoid-appending-slash-at-Cflags.patch
Modified:
  meson/trunk/PKGBUILD

------------------------------------------------------+
 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch |   32 +++++++++++++++++
 PKGBUILD                                             |   14 +++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

Added: 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch
===================================================================
--- 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch	                        (rev 0)
+++ 0001-pkgconfig-avoid-appending-slash-at-Cflags.patch	2017-07-11 11:24:28 UTC (rev 300091)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-11 11:06:52 UTC (rev 300090)
+++ PKGBUILD	2017-07-11 11:24:28 UTC (rev 300091)
@@ -5,7 +5,7 @@
 
 pkgname=meson
 pkgver=0.41.1+8+g1be77026
-pkgrel=1
+pkgrel=2
 pkgdesc='High productivity build system'
 url='http://mesonbuild.com/'
 arch=('any')
@@ -17,8 +17,10 @@
               '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")
-sha512sums=('SKIP')
+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() {
@@ -26,6 +28,12 @@
   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