From 211d61fb7da4920da79d6338c14e91e812a619f5d7a70d42f51bb9ee41acc940 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Sat, 10 Dec 2016 20:39:16 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=21

---
 meson-0.36.0-fix-old-pkgconfig-test.patch | 25 +++++++++++++++++++++++
 meson.changes                             |  6 ++++++
 meson.spec                                |  3 +++
 3 files changed, 34 insertions(+)
 create mode 100644 meson-0.36.0-fix-old-pkgconfig-test.patch

diff --git a/meson-0.36.0-fix-old-pkgconfig-test.patch b/meson-0.36.0-fix-old-pkgconfig-test.patch
new file mode 100644
index 0000000..4335cdd
--- /dev/null
+++ b/meson-0.36.0-fix-old-pkgconfig-test.patch
@@ -0,0 +1,25 @@
+--- "a/test cases/common/51 pkgconfig-gen/meson.build"
++++ "b/test cases/common/51 pkgconfig-gen/meson.build"
+@@ -19,11 +19,17 @@ pkgg.generate(
+ )
+ 
+ pkgconfig = find_program('pkg-config', required: false)
+-if pkgconfig.found() and build_machine.system() != 'windows'
+-  test('pkgconfig-validation', pkgconfig,
+-    args: ['--validate', 'simple'],
+-    env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ],
+-  )
++if pkgconfig.found()
++  v = run_command(pkgconfig, '--version').stdout().strip()
++  if v.version_compare('>=0.29')
++    test('pkgconfig-validation', pkgconfig,
++      args: ['--validate', 'simple'],
++      env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ])
++  else
++    message('pkg-config version \'' + v + '\' too old, skipping validate test')
++  endif
++else
++  message('pkg-config not found, skipping validate test')
+ endif
+ 
+ # Test that name_prefix='' and name='libfoo' results in '-lfoo'
diff --git a/meson.changes b/meson.changes
index 976de54..cbe1827 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Dec 10 20:38:23 UTC 2016 - sor.alexei@meowr.ru
+
+- Add meson-0.36.0-fix-old-pkgconfig-test.patch: tests/common/51:
+  Skip validate if pkg-config is too old (commit 2f804e9).
+
 -------------------------------------------------------------------
 Tue Nov 22 15:04:05 UTC 2016 - dimstar@opensuse.org
 
diff --git a/meson.spec b/meson.spec
index 987589b..81dcdf6 100644
--- a/meson.spec
+++ b/meson.spec
@@ -27,6 +27,8 @@ Url:            http://mesonbuild.com/
 Source:         https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
+# PATCH-FIX-UPSTREAM meson-0.36.0-fix-old-pkgconfig-test.patch nirbheek.chauhan@gmail.com -- tests/common/51: Skip validate if pkg-config is too old (commit 2f804e9).
+Patch0:         %{name}-0.36.0-fix-old-pkgconfig-test.patch
 BuildRequires:  bison
 BuildRequires:  boost-devel
 BuildRequires:  flex
@@ -69,6 +71,7 @@ and the like.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Lack of gtest, gmock, gnustep.
 rm -rf "test cases/frameworks/2 gtest" \