Accepting request 805826 from home:dimstar:Factory

- Update to version 0.54.2:
  + Various fixes around boost.
  + More robust cmake version detection.
  + Various GCC10 related fixes.
- Drop meson-gcc10.patch: fixed upstream.


Please do NOT forward to Factory; I want to current GCC10 checked in first

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

meson-0.54.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f76fb4572762be13ee479292610091b4509af5788bcceb391fe222bcd0296dc
-size 1687532

meson-0.54.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl6lc5AACgkQO/RpO/7r
-lCjkcg//RU5CChTZP6nHM2YI5KkgMhkiqHdc1XEM9uFHcpXneO/s8krmxG5By3yF
-TgADJwm6NJsKNLA1D/FlF9jxDMXya48F7FroSwgdCM0Glo/G8vRsvPLGE4FbmyMz
-qO331nN9CM91DyllCB27xrqLjEoN4w2p66nsPEPQwiMhYY5//VN41qfgTQOtMHKE
-WzKpcBELpja1Xc95DOKXMjbbHspb/VgVgifgsYU51RMHcso54ltXtNXoQd/yVFfz
-MjBBmw5W+Ihobi+JLxcn9vvEa5c+J9VaWLjNX99rTnW++yZVpyeV6Tule997eYBz
-GedSNcCwUSakwWXt6qCbvEb09+qfEifRHM0mEq5KLillrRoinP62AdpOZcutPWRc
-QUmhIZ4MZp+GN4C7w53mrjB0rWn/ce8/ImxwT3XXCJQmAX9wpBw0szRMV3MSFlk1
-zg2JUhd9ooc9NVM6geOsA/M3re/xg/X1YgMl+j1D1E+ZYhQsj1GRAWKYYkM3xGQZ
-pC9owI6K/VsbPy6rCKh6z+sbbHRhuTW8V8ARskBwXJ5m/DJ40gLlgSTUrIvujQQw
-jEwuvl9nl3vIdBAFOH/RlKTGbFuoJt55Q38PYqA26vTGszGUnEC5x6JNk1zLfevQ
-sK2lVQ4foWA8ZG30BnYbcGYUghaqwiUE0Wruzxd1dgYQj57lJVQ=
-=NJYX
------END PGP SIGNATURE-----

meson-0.54.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455
+size 1691270

meson-0.54.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl6+a9MACgkQO/RpO/7r
+lCjRGA//db1DufGLf9zBAmQVgmAHZLtsWybnrcjABVCOmgrCHsUjGUuoCswG7SCa
+CWTs3PokjAUe4uNUSCIHn55EVxMUmb4OR4GVqIqc/ffCPl7zvpikcolaoTAC/iLJ
+FfSe4I70FsghCADk61cxpu6HNSu0aCyhEFeFjxgImMc1BXzHNnaoGUci51ZSVjk0
+m26sSCjxpk5YC2emb6cvratX/i+w7m4PV3Iz3wWo6UsdbYE3+iQHgdpJXX2yCFED
+GXAEqwXiwTrrPiEwHxdPfQzIosVCHOgH9NXP1wDMC11H8I9NCNWUXuk7R3nc0/yD
+OdvG0PkhTciTaIQIARuo0+CKkijRnMYnJtKAoUaiwZNlnGrw7ft/ZoCjhqB+4myo
+owuYP/p1MceAyeXyo+wF1SvPzYG45dQvW1ZT9TevoWAtFQb4CjGOjjxT1Xytclso
+Lp8rX6ZkAEYhClsR0qrUNLnFfhBG2Sg+jsJQljs48bWRu8QxyB7Uj0GFxEKQ7cuX
+yNYNWXOu6BCcHmLMwHrQNVUNU7JGBHS8G/y/FRMwHQNMGPavzzz9zbKAfo8JwARL
+VbHbl+uN9fLmMGTp6NzwkBSkcT9dEk4u5j8tGqRQELZ0fEAul0A+HOfeLBZKcvrF
+MFmpdtCHTM0Qr5vHxWKB3yFXcqOuvrURNMorShmHEarNbJRRGMo=
+=zakm
+-----END PGP SIGNATURE-----

meson-gcc10.patch

@@ -1,36 +0,0 @@
-From 92102a911d3af9c69d33a386cc32f150bc14ba18 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-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.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri May 15 10:23:21 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 0.54.2:
+  + Various fixes around boost.
+  + More robust cmake version detection.
+  + Various GCC10 related fixes.
+- Drop meson-gcc10.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Thu May 14 07:32:14 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

meson.spec

@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with     setuptools
 Name:           meson%{name_ext}
-Version:        0.54.1
+Version:        0.54.2
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -49,8 +49,6 @@ 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 dimstar@opensuse.org -- Fix test suite with GCC 10
-Patch6:         meson-gcc10.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
@@ -173,7 +171,6 @@ This package provides support for meson.build files in Vim.
 %if !%{with setuptools}
 %patch5 -p1
 %endif
-%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" \