Hello community, here is the log from the commit of package meson for openSUSE:Leap:15.2 checked in at 2020-05-20 09:06:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/meson (Old) and /work/SRC/openSUSE:Leap:15.2/.meson.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Wed May 20 09:06:19 2020 rev:51 rq:807056 version:0.54.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/meson/meson.changes 2020-03-06 12:38:54.786670975 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.meson.new.2738/meson.changes 2020-05-20 09:06:19.492266177 +0200 @@ -1,0 +2,52 @@ +Thu May 14 07:32:14 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add meson-gcc10.patch: Fix test suite when using gcc 10. + +------------------------------------------------------------------- +Wed May 13 16:58:09 UTC 2020 - Michael Gorse <[email protected]> + +- Remove is_opensuse conditional and enable mono tests on SLE + (jsc#SLE-11721). + +------------------------------------------------------------------- +Mon Apr 27 10:11:58 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Update to version 0.54.1: + + compilers: Silence warning about gnu_inline with clang. + + cmake: Do not compile explicit header files. + + cmake: enhance support of cmake config file syntax. + + boost: Fix library version (fixes gh#mesonbuild/meeson#6899). + +------------------------------------------------------------------- +Mon Mar 30 11:18:38 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Update to version 0.54.0: + + Emscripten (emcc) now supports threads. + + Introduce dataonly for the pkgconfig module. + + Consistently report file locations relative to cwd. + + Native (build machine) compilers not always required. + + Add a system type dependency for zlib. + + New option --quiet to meson install. + + Property support emscripten's wasm-ld. + + Support for overiding the linker with ldc and gdc. + + Per subproject default_library and werror options. + + Ninja version requirement bumped to 1.7. + + Added -C argument to meson init command. + + CMake find_package COMPONENTS support. + + Added Microchip XC16 C compiler support. +- Rebase meson-test-installed-bin.patch. +- Drop meson-testsuite-boost.patch: fixed (and enhanced) upstream. +- Drop meson-testsuite-boost2.patch: boost test suite globally + disabled for now. +- Drop 6642.patch: Fixed in an alternative way. +- Remove hacks to drop static llvm and boost tests: fixed upstream. + +------------------------------------------------------------------- +Thu Feb 27 14:58:17 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Update to version 0.53.2: + + Various cmake related issues fixed. + + modules/python: Do not error out if positional args are passed. +- Drop meson-6614.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- 6642.patch meson-0.53.1.tar.gz meson-0.53.1.tar.gz.asc meson-6614.patch meson-testsuite-boost.patch meson-testsuite-boost2.patch New: ---- meson-0.54.1.tar.gz meson-0.54.1.tar.gz.asc meson-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.Rhmi2t/_old 2020-05-20 09:06:19.992267206 +0200 +++ /var/tmp/diff_new_pack.Rhmi2t/_new 2020-05-20 09:06:19.996267214 +0200 @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.53.1 +Version: 0.54.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -49,14 +49,8 @@ Patch4: meson-fix-gcc48.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch [email protected] -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch -# PATCH-FIX-UPSTREAM meson-testsuite-boost.patch [email protected] -- https://github.com/mesonbuild/meson/issues/4788 -Patch6: meson-testsuite-boost.patch -# PATCH-FIX-UPSTREAM meson-6614.patch [email protected] -- cmake: Fix crash when no C++ compiler is not installed -Patch7: meson-6614.patch -# PATCH-FIX-UPSTREAM 6642.patch [email protected] -- Fix skip python2 unittests -Patch8: 6642.patch -# PATCH-FIX-OPENSUSE meson-testsuite-boost2.patch [email protected] -- disable libboost_python tests -Patch9: meson-testsuite-boost2.patch +# PATCH-FIX-UPSTREAM [email protected] -- Fix test suite with GCC 10 +Patch6: meson-gcc10.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -66,7 +60,7 @@ Requires: python3-setuptools %endif %if !%{with test} -Requires: ninja +Requires: ninja >= 1.7 Requires: python3-base # meson-gui was last used in openSUSE Leap 42.1. Provides: meson-gui = %{version} @@ -133,15 +127,11 @@ BuildRequires: wxWidgets-any-devel # csharp is not on s390 machines %ifnarch s390x -%if 0%{?is_opensuse} BuildRequires: mono(csharp) %endif -%endif %else BuildRequires: boost-devel -%if 0%{?is_opensuse} BuildRequires: mono-core -%endif BuildRequires: wxWidgets-devel %endif %endif @@ -183,25 +173,11 @@ %if !%{with setuptools} %patch5 -p1 %endif -(cd "test cases/frameworks/1 boost" -%patch6 -p0 -) -%patch7 -p1 -%patch8 -p1 -%if 0%{?suse_version} >= 1550 -(cd "test cases/frameworks/1 boost" -%patch9 -p0 -) -%endif - -# Remove static boost tests from "test cases/frameworks/1 boost/". -sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build - -# Disable test of llvm-static libs: openSUSE does not package/ship them -sed -i "s/foreach static : \[true, false\]/foreach static : \[false\]/" test\ cases/frameworks/15\ llvm/meson.build +%patch6 -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" \ + "test cases/frameworks/1 boost" \ "test cases/objc/2 nsstring" # AddressSanitizer fails here because of ulimit. ++++++ meson-0.53.1.tar.gz -> meson-0.54.1.tar.gz ++++++ ++++ 29858 lines of diff (skipped) ++++++ meson-gcc10.patch ++++++ >From 92102a911d3af9c69d33a386cc32f150bc14ba18 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <[email protected]> Date: Thu, 14 May 2020 09:41:12 +0530 Subject: [PATCH] gfortran: Fix has_header implementation with GCC 10 __has_include is not accepted as a pre-processor directive in Fortran code since GCC 10. Closes https://github.com/mesonbuild/meson/issues/7017 --- mesonbuild/compilers/fortran.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) Index: meson-0.54.1/mesonbuild/compilers/fortran.py =================================================================== --- meson-0.54.1.orig/mesonbuild/compilers/fortran.py +++ meson-0.54.1/mesonbuild/compilers/fortran.py @@ -208,6 +208,18 @@ class GnuFortranCompiler(GnuCompiler, Fo def language_stdlib_only_link_flags(self): return ['-lgfortran', '-lm'] + def has_header(self, hname, prefix, env, *, extra_args=None, dependencies=None, disable_cache=False): + ''' + Derived from mixins/clike.py:has_header, but without C-style usage of + __has_include which breaks with GCC-Fortran 10: + https://github.com/mesonbuild/meson/issues/7017 + ''' + fargs = {'prefix': prefix, 'header': hname} + code = '{prefix}\n#include <{header}>' + return self.compiles(code.format(**fargs), env, extra_args=extra_args, + dependencies=dependencies, mode='preprocess', disable_cache=disable_cache) + + class ElbrusFortranCompiler(GnuFortranCompiler, ElbrusCompiler): def __init__(self, exelist, version, for_machine: MachineChoice, is_cross, info: 'MachineInfo', exe_wrapper=None, ++++++ meson-test-installed-bin.patch ++++++ --- /var/tmp/diff_new_pack.Rhmi2t/_old 2020-05-20 09:06:20.832268935 +0200 +++ /var/tmp/diff_new_pack.Rhmi2t/_new 2020-05-20 09:06:20.832268935 +0200 @@ -1,8 +1,8 @@ -Index: meson-0.53.0/run_tests.py +Index: meson-0.54.0/run_tests.py =================================================================== ---- meson-0.53.0.orig/run_tests.py -+++ meson-0.53.0/run_tests.py -@@ -134,18 +134,10 @@ def get_meson_script(): +--- meson-0.54.0.orig/run_tests.py ++++ meson-0.54.0/run_tests.py +@@ -152,18 +152,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,7 +23,7 @@ def get_backend_args_for_dir(backend, builddir): ''' -@@ -363,12 +355,12 @@ def main(): +@@ -366,12 +358,12 @@ def main(): else: env['PYTHONPATH'] = temp_dir if not cross: @@ -41,4 +41,4 @@ + # return returncode if no_unittests: print('Skipping all unit tests.') - returncode = 0 + print(flush=True)
