diff --git a/7930.patch b/7930.patch deleted file mode 100644 index 8b1bffe..0000000 --- a/7930.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2b923f532c3e16687910fecb09cedb80a76597cf Mon Sep 17 00:00:00 2001 -From: Xavier Claessens -Date: Tue, 3 Nov 2020 09:39:39 -0500 -Subject: [PATCH] pkgconfig: Make external deps of static library public - -This fix a regression caused by -https://github.com/mesonbuild/meson/pull/7837, it wanted to make -InternalDependency's external_deps private but has side effect of making -StatisLibrary's external_deps private too. - -It is technically correct to make them private, but Meson used to make -StaticLibrary deps public so they are usable without `pkg-config ---static` when we know there is only a static library available. - -Fixes: #7929. ---- - mesonbuild/modules/pkgconfig.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py -index a863b33c93..62e1c1595c 100644 ---- a/mesonbuild/modules/pkgconfig.py -+++ b/mesonbuild/modules/pkgconfig.py -@@ -131,7 +131,7 @@ def _process_libs(self, libs, public): - if obj.found(): - processed_libs += obj.get_link_args() - processed_cflags += obj.get_compile_args() -- self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public) -+ self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public, private_external_deps=True) - elif isinstance(obj, dependencies.Dependency): - if obj.found(): - processed_libs += obj.get_link_args() -@@ -160,7 +160,7 @@ def _process_libs(self, libs, public): - - return processed_libs, processed_reqs, processed_cflags - -- def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps, public): -+ def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps, public, private_external_deps=False): - add_libs = self.add_pub_libs if public else self.add_priv_libs - # Recursively add all linked libraries - for t in link_targets: -@@ -173,7 +173,10 @@ def _add_lib_dependencies(self, link_targets, link_whole_targets, external_deps, - for t in link_whole_targets: - self._add_link_whole(t, public) - # And finally its external dependencies -- self.add_priv_libs(external_deps) -+ if private_external_deps: -+ self.add_priv_libs(external_deps) -+ else: -+ add_libs(external_deps) - - def _add_link_whole(self, t, public): - # Don't include static libraries that we link_whole. But we still need to diff --git a/meson-0.56.0.tar.gz b/meson-0.56.0.tar.gz deleted file mode 100644 index 0685566..0000000 --- a/meson-0.56.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213 -size 1794974 diff --git a/meson-0.56.0.tar.gz.asc b/meson-0.56.0.tar.gz.asc deleted file mode 100644 index 97f916c..0000000 --- a/meson-0.56.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl+b2MoACgkQO/RpO/7r -lChjlg/6AsKeKgw+2kC9hLp7Fz6qrPUulWfI1uqZ/wCn/nkiWfVVPiyMjvin7KBU -k4t7fFZvEA2mAbp+Itm8LB9sEFlsKL3hGHB14OmKAbTjnjW+L4bPB0IgLvazxv9O -LRoWkxQTJA0deoWCAe0siJ5H7JUabc+1vUToGURTYfrhrmMzTudm/CiRDDpnLsB+ -wc6UPfYtpQ6zUB2uF/lWtUqnLU9O3tz5hNnYdzbjbxOTvOo9xo9d5LsnN+omOxIj -bqZq3hcKjlz06WmfabD/KAH13U1iS8+cn1Q15J2l64uKVr0YTgVALprpFXvoDEaW -az0snIk7CPR48D8xEpzyVHR1SGZZMX9AM+o564JMgfRWOWOk9YrQVg3+udh+XLc6 -U8RubTNBVzMB7Z8z+ce9KTFLekUDxxwCHSRr+bLcJ8UHbrkSn6fWhalPJ+UZ/pf/ -BfSQZ0bMoWBzDI+Ig6C604dNGg6N1rJlJP2X2W7UFjmjqV//snWhLNUvBf+T6du4 -sTEeYWs1yaFvIMUuPwACKQ6IDRKgkQOA6TVA1CLQ/1wptOtDfWkcoJm8pW/jXQfZ -7xWg0DwQsCfrrVd11BF484xGUsJVbi8+fBMUug3nJVAW0Rf4i0iAVKUOj81D2BU4 -6j0nSK2C3aEU7ZIqrbPtxn2M8lzj0L5tYK+dB1y6U91DrZdQLcc= -=xAl0 ------END PGP SIGNATURE----- diff --git a/meson-0.56.1.tar.gz b/meson-0.56.1.tar.gz new file mode 100644 index 0000000..1cfd04a --- /dev/null +++ b/meson-0.56.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5780725304eaa28aac5e7de99d2d8d045112fbc10cf9f4181498b877de0ecf28 +size 1794519 diff --git a/meson-0.56.1.tar.gz.asc b/meson-0.56.1.tar.gz.asc new file mode 100644 index 0000000..8b6b428 --- /dev/null +++ b/meson-0.56.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAl/1m1sACgkQwk5jG6ux +/nC2NA/+JM1k2kFtwOG43V9/cLc0LVBLkXWfBn3HiUikRN1Zw2OFAibEbPjnb/X1 +U6cOwZcE5nEqlzw/arItyKBeDWKG4VKsTPzPhTcwjZVo+Z6jSlc8WoYqAkm4Hoc2 +zAL+liX9dcrWImnYtYW61vIL/qERzuklYpCG6VXwRTa7R5ZW8HxlvJf0KO1ExoAk +CI5a3u6o31lmRz771IRW664riHNNMXURguJ6RfMmVlhwxGyVI0Wvfpp34Zlo/Gza +mxOwj7rI/H+ccf885OM5Hkv5Ctyd4GPpMmDrJT9sB7WUFqOuI12Si0P/UqBqP6Dk +OEFWWdxXJTX+yFMzuSgkPZJW2Jy5zcdRsVUqxzF3uQfcN54OUzPKYBauc+JOzDrp +Nli1WmnC+Exri4wCQHAatf+nXiXfYthX4CFNe8DTkt7TuCyYfzHGGttly9L9+JJY +hztnRwD/jkzfYJMqNQF6YlYrU9/MHmH4lyd2QnBldzg+8yyMGWFYTurCDXSWKLaW +XdAF5qtZehkABIbZVnemqhr5lATV7RkQ+fKyKL3byy946gLMp5iqPhmflNIDsevN +hyx4cj7fovyFyyHhHhzMTJYuAyKBxYPr+mxMvN7ByKhGXCkNDLzAHMsgmTgTBI/z +k94AdaBc70Nt832xrJwHRVtXQDUrxB0sWGa5n04wfy2lvsRS9fQ= +=gT27 +-----END PGP SIGNATURE----- diff --git a/meson.changes b/meson.changes index 333a140..c97d154 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 6 11:32:14 UTC 2021 - Dominique Leuenberger + +- Update to version 0.56.1: + + pkgconfig: Make external deps of static library public. + + interpreter: store correct files for project regeneration. + + environment: Properly pass linker to rustc. + + Add aarch64 assembly test. +- Drop 7930.patch: fixed upstream. +- Add new keyid C24E631BABB1FE70 to the keyring (counter signed by + the old key id): the old key was about to expire. + ------------------------------------------------------------------- Tue Nov 17 13:25:10 UTC 2020 - Guillaume GARDET diff --git a/meson.keyring b/meson.keyring index e563f07..3147553 100644 --- a/meson.keyring +++ b/meson.keyring @@ -138,3 +138,55 @@ c9R0hR9iXMRTtVF/4M0QjbfswXAhIFDxACfYwIs/uze9Ij5/jGPYMdxzIw3sgkMV Yk4Wl26lcjaUkwNEwPvTEtq3fjwKoisLbg== =Smkh -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +dxBkBtFt+g3obj4= +=AiRn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/meson.spec b/meson.spec index d38faa1..889bf2b 100644 --- a/meson.spec +++ b/meson.spec @@ -1,7 +1,7 @@ # # spec file for package meson # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.56.0 +Version: 0.56.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -43,8 +43,6 @@ Patch0: meson-suse-ify-macros.patch Patch1: meson-test-installed-bin.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools Patch2: meson-distutils.patch -# PATCH-FIX-UPSTREAM 7930.patch -- pkgconfig: Make external deps of static library public -Patch3: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/7930.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -164,7 +162,6 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch2 -p1 %endif -%patch3 -p1 # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \