Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2020-11-09 13:56:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Mon Nov 9 13:56:08 2020 rev:65 rq:845992 version:0.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2020-09-23 18:35:50.957078823 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new.11331/meson.changes 2020-11-09 13:56:11.252124259 +0100 @@ -1,0 +2,31 @@ +Tue Nov 3 14:57:22 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add 7930.patch: pkgconfig: Make external deps of static library + public. + +------------------------------------------------------------------- +Fri Oct 30 09:20:33 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Update to version 0.56.0: + + meson test can now filter tests by subproject + + Native (build machine) compilers not always required by + project(). + + New extra_files key in target introspection. + + meson.build_root() and meson.source_root() are deprecated. + + dep.as_link_whole(). + + Added NVidia HPC SDK compilers. + + CMake subproject cross compilation support. + + Machine file keys are stored case sensitive. + + Consistency between declare_dependency() and + pkgconfig.generate() variables. + + Qt5 compile_translations now supports qresource preprocessing. + + Controlling subproject dependencies with + dependency(allow_fallback: ...). + + Improvements for the builtin curses dependency. + + HDF5 dependency improvements. + + Dependencies listed in test and benchmark introspection. + + Deprecate Dependency.get_pkgconfig_variable and + Dependency.get_configtool_variable. +- Rebase meson-test-installed-bin.patch. + +------------------------------------------------------------------- Old: ---- meson-0.55.3.tar.gz meson-0.55.3.tar.gz.asc New: ---- 7930.patch meson-0.56.0.tar.gz meson-0.56.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.MKI65w/_old 2020-11-09 13:56:12.304121965 +0100 +++ /var/tmp/diff_new_pack.MKI65w/_new 2020-11-09 13:56:12.308121957 +0100 @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.55.3 +Version: 0.56.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -43,6 +43,8 @@ Patch1: meson-test-installed-bin.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch [email protected] -- 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 @@ -162,6 +164,7 @@ %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" \ ++++++ 7930.patch ++++++ >From 2b923f532c3e16687910fecb09cedb80a76597cf Mon Sep 17 00:00:00 2001 From: Xavier Claessens <[email protected]> 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 ++++++ meson-0.55.3.tar.gz -> meson-0.56.0.tar.gz ++++++ ++++ 30199 lines of diff (skipped) ++++++ meson-test-installed-bin.patch ++++++ --- /var/tmp/diff_new_pack.MKI65w/_old 2020-11-09 13:56:13.288119819 +0100 +++ /var/tmp/diff_new_pack.MKI65w/_new 2020-11-09 13:56:13.288119819 +0100 @@ -1,8 +1,8 @@ -Index: meson-0.54.0/run_tests.py +Index: meson-0.56.0/run_tests.py =================================================================== ---- meson-0.54.0.orig/run_tests.py -+++ meson-0.54.0/run_tests.py -@@ -152,18 +152,10 @@ def get_meson_script(): +--- meson-0.56.0.orig/run_tests.py ++++ meson-0.56.0/run_tests.py +@@ -153,18 +153,10 @@ def get_meson_script(): Also used by run_unittests.py to determine what meson to run when not running in-process (which is the default). ''' @@ -23,10 +23,10 @@ def get_backend_args_for_dir(backend, builddir): ''' -@@ -366,12 +358,12 @@ def main(): +@@ -352,12 +344,12 @@ def main(): else: env['PYTHONPATH'] = temp_dir - if not cross: + if not options.cross: - cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] - if options.failfast: - cmd += ['--failfast']
