From 4fccc50640d35e522f6de3f37450bdb3f0323e0ff30a2b07f5983f9e5285fcf0 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 30 Apr 2018 12:10:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=97 --- meson-restore-python3.4.patch | 16 ++++++++++++++++ meson-testsuite.changes | 1 + meson-testsuite.spec | 20 ++++++++++---------- meson.changes | 1 + meson.spec | 22 +++++++++++----------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/meson-restore-python3.4.patch b/meson-restore-python3.4.patch index 67a53af..a684322 100644 --- a/meson-restore-python3.4.patch +++ b/meson-restore-python3.4.patch @@ -141,6 +141,22 @@ print(p.stdout) if p.returncode != 0: if 'MESON_SKIP_TEST' in p.stdout: +@@ -2940,8 +2966,13 @@ endian = 'little' + self.init(testdir) + myenv = os.environ.copy() + myenv['PKG_CONFIG_PATH'] = self.privatedir +- ro = subprocess.run(['pkg-config', '--libs', 'libsomething'], stdout=subprocess.PIPE, +- env=myenv) ++ if sys.version_info >= (3, 5): ++ ro = subprocess.run(['pkg-config', '--libs', 'libsomething'], ++ stdout=subprocess.PIPE, env=myenv) ++ else: ++ ro = subprocess.Popen(['pkg-config', '--libs', 'libsomething'], ++ stdout=subprocess.PIPE, env=myenv) ++ ro.stdout = ro.communicate()[0] + self.assertEqual(ro.returncode, 0) + self.assertIn(b'-lgobject-2.0', ro.stdout) + self.assertIn(b'-lgio-2.0', ro.stdout) --- a/setup.py +++ b/setup.py @@ -19,9 +19,9 @@ import sys diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 041ba2b..89a72d6 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -3,6 +3,7 @@ Mon Apr 30 07:03:53 UTC 2018 - dimstar@opensuse.org - Add meson-keep-spaces-in-pc-files.patch: Keep spaces in generated pkgconfig files (gh#mesonbuild/meson#3479). +- Rebase meson-restore-python3.4.patch. ------------------------------------------------------------------- Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 4969562..727a5d3 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -37,14 +37,14 @@ Source2: meson.keyring Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch1: meson-test-installed-bin.patch -# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. -Patch2: meson-suse-fix-llvm-3.8.patch -# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). -Patch3: meson-restore-python3.4.patch -# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. -Patch4: meson-fix-gcc48.patch # PATCH-FIX-UPSTREAM meson-keep-spaces-in-pc-files.patch gh#mesonbuild/meson#3479 dimstar@opensuse.org -- Keep spaces in generated .pc files -Patch5: meson-keep-spaces-in-pc-files.patch +Patch2: meson-keep-spaces-in-pc-files.patch +# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. +Patch3: meson-suse-fix-llvm-3.8.patch +# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). +Patch4: meson-restore-python3.4.patch +# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. +Patch5: meson-fix-gcc48.patch BuildRequires: python3 BuildArch: noarch %if %{testsuite} @@ -131,12 +131,12 @@ This package provides support for meson.build files in Vim. %setup -q -n meson-%{version} %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} < 1500 %patch2 -p1 +%if 0%{?suse_version} < 1500 %patch3 -p1 %patch4 -p1 -%endif %patch5 -p1 +%endif # Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build @@ -190,7 +190,7 @@ python3 run_tests.py %if 0%{?suse_version} >= 1500 %license COPYING %else -%license COPYING +%doc COPYING %endif %if !%{testsuite} %{_bindir}/meson diff --git a/meson.changes b/meson.changes index 041ba2b..89a72d6 100644 --- a/meson.changes +++ b/meson.changes @@ -3,6 +3,7 @@ Mon Apr 30 07:03:53 UTC 2018 - dimstar@opensuse.org - Add meson-keep-spaces-in-pc-files.patch: Keep spaces in generated pkgconfig files (gh#mesonbuild/meson#3479). +- Rebase meson-restore-python3.4.patch. ------------------------------------------------------------------- Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index 6246212..08fcc71 100644 --- a/meson.spec +++ b/meson.spec @@ -1,5 +1,5 @@ # -# spec file for package meson +# spec file for package meson-testsuite # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -37,14 +37,14 @@ Source2: meson.keyring Patch0: meson-suse-ify-macros.patch # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch1: meson-test-installed-bin.patch -# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. -Patch2: meson-suse-fix-llvm-3.8.patch -# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). -Patch3: meson-restore-python3.4.patch -# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. -Patch4: meson-fix-gcc48.patch # PATCH-FIX-UPSTREAM meson-keep-spaces-in-pc-files.patch gh#mesonbuild/meson#3479 dimstar@opensuse.org -- Keep spaces in generated .pc files -Patch5: meson-keep-spaces-in-pc-files.patch +Patch2: meson-keep-spaces-in-pc-files.patch +# PATCH-FIX-OPENSUSE meson-suse-fix-llvm-3.8.patch -- Fix LLVM 3.8 tests. +Patch3: meson-suse-fix-llvm-3.8.patch +# PATCH-FIX-OPENSUSE meson-restore-python3.4.patch -- Restore Python 3.4 support (reverts commit 0538009). +Patch4: meson-restore-python3.4.patch +# PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. +Patch5: meson-fix-gcc48.patch BuildRequires: python3 BuildArch: noarch %if %{testsuite} @@ -131,12 +131,12 @@ This package provides support for meson.build files in Vim. %setup -q -n meson-%{version} %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} < 1500 %patch2 -p1 +%if 0%{?suse_version} < 1500 %patch3 -p1 %patch4 -p1 -%endif %patch5 -p1 +%endif # Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build @@ -190,7 +190,7 @@ python3 run_tests.py %if 0%{?suse_version} >= 1500 %license COPYING %else -%license COPYING +%doc COPYING %endif %if !%{testsuite} %{_bindir}/meson