diff --git a/meson-0.53.0.tar.gz b/meson-0.53.0.tar.gz deleted file mode 100644 index d416c6b..0000000 --- a/meson-0.53.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6 -size 1548224 diff --git a/meson-0.53.0.tar.gz.sig b/meson-0.53.0.tar.gz.sig deleted file mode 100644 index 778f686..0000000 Binary files a/meson-0.53.0.tar.gz.sig and /dev/null differ diff --git a/meson-0.53.1.tar.gz b/meson-0.53.1.tar.gz new file mode 100644 index 0000000..6992423 --- /dev/null +++ b/meson-0.53.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 +size 1552121 diff --git a/meson-0.53.1.tar.gz.asc b/meson-0.53.1.tar.gz.asc new file mode 100644 index 0000000..a0dfa62 --- /dev/null +++ b/meson-0.53.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl4qJUYACgkQO/RpO/7r +lChjcQ//byfqVeXmHPingaXK+N9pTn9N0TFuLJ2wd3bN9eX1A5p2uPYedTI35re2 +09AiKTt85oIu5PJ2PDNDl62xA6Pn5H+ZVfEWofJFP4J11NHTF2G8G4RwUBFkfqUK +DGX8ulTskS+0u9w6fJ+Rqamd8BJWQMqvg3ziM6PIKucrbQHVRl0a5bcBRHa/Y7E1 +V4B725klZfGdhgGZUN+KHLpL0oKUrPCKwoinZJL24IM5TlpFbMVb40Igq5E8FFar +mc7hrU4ZxnSISAwrrDTJR4npIz1DbbIw7+ejcddWFA/SAeyjb31cuem0cmD1R451 +Bwm6ssYZP0qHcM2Sz6Zzg32g8R08U9tax0o34U1V4U6UaoMij9QPx8EFVNUPukjc +ADVfkUt1yvHB08UafGNd67hYXNoPgBsJ2k9xb4QP53OuD8LejM9cPCAAWCXpFJ+d +BoLBE6aB+zuberqEmOByvXmvW35hg7WnMIAVWRvyCxZroco3f260CXOQouijuUfe +FVjS/Lq+xNR4PjaW/D6Mp487YK1CI3LPBlLV7pEMtHWOTqgM2TNVLEGqpRr+hIKs +S/mGgc0t5Z9vuQ5R9jjz8hULCeQWISvoB3hd6+m5C2GBlIJ3aJqxcyntfCRk7H5R +Z/nL6hAIxc17NUEFfgd7wcdciLTA8dRvBXfhWN4sKlMpjd6UJYg= +=wW9R +-----END PGP SIGNATURE----- diff --git a/meson-pkgconf-libdir.patch b/meson-pkgconf-libdir.patch deleted file mode 100644 index c2930a7..0000000 --- a/meson-pkgconf-libdir.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Mon, 13 Jan 2020 23:46:09 -0500 -Subject: [PATCH] test_pkgconfig_gen_deps: set - PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib - -pkgconf automatically prunes "system library paths" from its output. The -system library paths depend on the system toolchain. A common value on a -64-bit system is as follows: - -/lib64:/usr/lib64:/usr/local/lib64 - -So, if -L/usr/lib64 appears in the Libs section, it will be pruned from -the output of pkg-config --libs. - -The pc files generated for this test contain something like this: - -libdir=/usr/lib -Libs: -L${libdir} ... - -pkgconf may not consider /usr/lib to be a system library path, so it is -not pruned as the test expects. To work around this, override the -compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH -environment variable. - -Fixes: https://github.com/mesonbuild/meson/issues/6004 ---- - run_unittests.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 898f05e54d..5a60b9b6a4 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self): - privatedir2 = self.privatedir - - os.environ -- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])} -+ env = { -+ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]), -+ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib', -+ } - self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env) - - # pkg-config strips some duplicated flags so we have to parse the - diff --git a/meson-testsuite-boost.patch b/meson-testsuite-boost.patch index 303cee8..2c13ac4 100644 --- a/meson-testsuite-boost.patch +++ b/meson-testsuite-boost.patch @@ -1,8 +1,8 @@ -Index: meson-0.53.0/test cases/frameworks/1 boost/meson.build -=================================================================== ---- meson.build -+++ meson.build -@@ -35,16 +35,7 @@ python3dep = python3.dependency(required +diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build +index eec8728e..c02223a0 100644 +--- meson.build ++++ meson.build +@@ -35,28 +35,14 @@ python3dep = python3.dependency(required: host_machine.system() == 'linux', embe # compile python 2/3 modules only if we found a corresponding python version if(python2dep.found() and host_machine.system() == 'linux') @@ -11,26 +11,25 @@ Index: meson-0.53.0/test cases/frameworks/1 boost/meson.build - # on the installed version of python (and hope that they match the version boost - # was compiled against) - py2version_string = ''.join(python2dep.version().split('.')) -- bpython2dep = dependency('boost', modules : ['python' + py2version_string]) +- bpython2dep = dependency('boost', modules : ['python' + py2version_string], required: false, disabler: true) - else - # if we have an older version of boost, we need to use the old module names -- bpython2dep = dependency('boost', modules : ['python']) +- bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) - endif -+ bpython2dep = dependency('boost', modules : ['python']) - - if not (bpython2dep.found()) - bpython2dep = disabler() -@@ -55,12 +46,7 @@ else ++ bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) + else + python2dep = disabler() + bpython2dep = disabler() endif if(python3dep.found() and host_machine.system() == 'linux') - if(dep.version().version_compare('>=1.67')) - py3version_string = ''.join(python3dep.version().split('.')) -- bpython3dep = dependency('boost', modules : ['python' + py3version_string]) +- bpython3dep = dependency('boost', modules : ['python' + py3version_string], required: false, disabler: true) - else -- bpython3dep = dependency('boost', modules : ['python3']) +- bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) - endif -+ bpython3dep = dependency('boost', modules : ['python3']) - - if not (bpython3dep.found()) - bpython3dep = disabler() ++ bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) + else + python3dep = disabler() + bpython3dep = disabler() diff --git a/meson.changes b/meson.changes index 3f94003..de78eae 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 24 13:16:24 UTC 2020 - Dominique Leuenberger + +- Update to version 0.53.1: + + Use python3 in some tests which were still using python. + + test_pkgconfig_gen_deps: set + PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib. pkgconf automatically + prunes "system library paths" from its output. + + compilers: Derive CompilerArgs from collections instead of + typing. +- Drop meson-pkgconf-libdir.patch: fixed upstream. +- Rebase meson-testsuite-boost.patch. + ------------------------------------------------------------------- Wed Jan 8 11:48:50 UTC 2020 - Dominique Leuenberger diff --git a/meson.spec b/meson.spec index 7155245..c099982 100644 --- a/meson.spec +++ b/meson.spec @@ -28,14 +28,14 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.53.0 +Version: 0.53.1 Release: 0 Summary: Python-based build system License: Apache-2.0 Group: Development/Tools/Building URL: http://mesonbuild.com/ Source: https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz -Source1: https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz.sig +Source1: https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz.asc Source2: meson.keyring # PATCH-FIX-OPENSUSE meson-suse-ify-macros.patch dimstar@opensuse.org -- Make the macros non-RedHat specific: so far there are no separate {C,CXX,F}FLAGS. Patch0: meson-suse-ify-macros.patch @@ -49,10 +49,8 @@ Patch3: meson-suse-fix-llvm-3.8.patch Patch4: meson-fix-gcc48.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch -# PATCH-FIX-UPSTREAM meson-pkgconf-libdir.patch dimstar@opensuse.org -- https://github.com/mesonbuild/meson/pull/6458 -Patch6: meson-pkgconf-libdir.patch # PATCH-FIX-UPSREAM meson-testsuite-boost.patch dimstar@opensuse.org -- https://github.com/mesonbuild/meson/issues/4788 -Patch7: meson-testsuite-boost.patch +Patch6: meson-testsuite-boost.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -170,9 +168,8 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch5 -p1 %endif -%patch6 -p1 (cd "test cases/frameworks/1 boost" -%patch7 -p0 +%patch6 -p0 ) # Remove static boost tests from "test cases/frameworks/1 boost/".