rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=97

Browse Source
This commit is contained in:
Alexei Sorokin 2018-04-30 12:10:07 +00:00 committed by Git OBS Bridge
parent e3d4a78d0b
commit 4fccc50640
5 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson-restore-python3.4.patch
View File

@ -141,6 +141,22 @@
print(p.stdout) print(p.stdout)
if p.returncode != 0: if p.returncode != 0:
if 'MESON_SKIP_TEST' in p.stdout: 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 --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -19,9 +19,9 @@ import sys @@ -19,9 +19,9 @@ import sys

1
meson-testsuite.changes
View File

@ -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 - Add meson-keep-spaces-in-pc-files.patch: Keep spaces in generated
pkgconfig files (gh#mesonbuild/meson#3479). pkgconfig files (gh#mesonbuild/meson#3479).
- Rebase meson-restore-python3.4.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru

20
meson-testsuite.spec
View File

@ -37,14 +37,14 @@ Source2: meson.keyring
Patch0: meson-suse-ify-macros.patch 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. # 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 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 # 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 BuildRequires: python3
BuildArch: noarch BuildArch: noarch
%if %{testsuite} %if %{testsuite}
@ -131,12 +131,12 @@ This package provides support for meson.build files in Vim.
%setup -q -n meson-%{version} %setup -q -n meson-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} < 1500
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} < 1500
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%endif
%patch5 -p1 %patch5 -p1
%endif
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) # 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 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
@ -190,7 +190,7 @@ python3 run_tests.py
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%license COPYING %license COPYING
%else %else
%license COPYING %doc COPYING
%endif %endif
%if !%{testsuite} %if !%{testsuite}
%{_bindir}/meson %{_bindir}/meson

1
meson.changes
View File

@ -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 - Add meson-keep-spaces-in-pc-files.patch: Keep spaces in generated
pkgconfig files (gh#mesonbuild/meson#3479). pkgconfig files (gh#mesonbuild/meson#3479).
- Rebase meson-restore-python3.4.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru Wed Apr 25 18:53:17 UTC 2018 - sor.alexei@meowr.ru

22
meson.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package meson # spec file for package meson-testsuite
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
@ -37,14 +37,14 @@ Source2: meson.keyring
Patch0: meson-suse-ify-macros.patch 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. # 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 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 # 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 BuildRequires: python3
BuildArch: noarch BuildArch: noarch
%if %{testsuite} %if %{testsuite}
@ -131,12 +131,12 @@ This package provides support for meson.build files in Vim.
%setup -q -n meson-%{version} %setup -q -n meson-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} < 1500
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} < 1500
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%endif
%patch5 -p1 %patch5 -p1
%endif
# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname) # 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 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
@ -190,7 +190,7 @@ python3 run_tests.py
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%license COPYING %license COPYING
%else %else
%license COPYING %doc COPYING
%endif %endif
%if !%{testsuite} %if !%{testsuite}
%{_bindir}/meson %{_bindir}/meson