From b09e92a1654fd14cf92841f1f449b06007f3b1cc7369fdad175dd7714e381b86 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 25 Feb 2023 19:36:29 +0000 Subject: [PATCH] Accepting request 1067721 from home:AndreasStieger:branches:devel:tools:building meson 1.0.1 OBS-URL: https://build.opensuse.org/request/show/1067721 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=243 --- meson-1.0.0.tar.gz | 3 --- meson-1.0.0.tar.gz.asc | 16 ---------------- meson-1.0.1.tar.gz | 3 +++ meson-1.0.1.tar.gz.asc | 16 ++++++++++++++++ meson-test-installed-bin.patch | 19 +++++++------------ meson.changes | 7 +++++++ meson.spec | 11 +++++------ 7 files changed, 38 insertions(+), 37 deletions(-) delete mode 100644 meson-1.0.0.tar.gz delete mode 100644 meson-1.0.0.tar.gz.asc create mode 100644 meson-1.0.1.tar.gz create mode 100644 meson-1.0.1.tar.gz.asc diff --git a/meson-1.0.0.tar.gz b/meson-1.0.0.tar.gz deleted file mode 100644 index cf6c13b..0000000 --- a/meson-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05 -size 2099642 diff --git a/meson-1.0.0.tar.gz.asc b/meson-1.0.0.tar.gz.asc deleted file mode 100644 index 62fa305..0000000 --- a/meson-1.0.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmOl3mQACgkQwk5jG6ux -/nCxfg//d09dQxkIHWcSzCM26BztdAnYbvExBLWh1YzC0gKhd5zWg4BSiRaB+Tyr -CrpZPayidQ2jzeEZb1bUyATBkx7xf7n6TJlx974VDcNvUR7wUdBr9ywKEQvGxROI -LHD3DYSMN1r8SG12FH8uxkR/mjAt7lQiWWBcbTPEeB/zKaA/hAypjsjnIX8Zlukl -lJb4Ukfd1u4sDIcYVdu9TZQb2kf2AOzP5TQuF+fmfhVFMFXd3zi0L9NytL0g+Zu4 -eZgaj2iAn+Dpe3toMqS8pDPwTWJ/xyzB5otslH0oRw3kuHbx3c13BuEs1IAcsxfi -hWVL23by3LQVtIGBF3MjxkxzXGNgEFjJjalV3ODHJOVxESlpUXNlCkSxv6+JnRv7 -ZOsAmW8LiYOLP+FfiJM3pwpZjcpyh9IyjYYd8h20aFb8iQyXbXPUGEf1MJSa4pGe -Y5j2EXAQHm9XKNx2dyHMp1lyh5HU+F8mxGlg7BJcvz/0KHV9ubp8FA3eX2TtM30S -d4hSraISqAFPbhSxJCUeInTESVbcOpgSB75IQdNO4aMl/3jVKB7t3nT9NS+qgmMC -l+f5VEKYPZ1TLYfeDeVb5E+pDseAz13EbgVdESZ3Vk10mthm3kQ+WMfUDuTS9WAg -ltpt+pP3AzpB687oj++rFO8MIhxIseqDgZAAdyih6Pr7TQLnKsY= -=RENA ------END PGP SIGNATURE----- diff --git a/meson-1.0.1.tar.gz b/meson-1.0.1.tar.gz new file mode 100644 index 0000000..3d9aba2 --- /dev/null +++ b/meson-1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1 +size 2104183 diff --git a/meson-1.0.1.tar.gz.asc b/meson-1.0.1.tar.gz.asc new file mode 100644 index 0000000..ee14bea --- /dev/null +++ b/meson-1.0.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmP36mYACgkQwk5jG6ux +/nBPZQ/5AQ9sEd5qNnxOqIk2Vjs/my4F9VpwQZMz+AFQvftY+t7PzparkCXZ4lOo +bpdagz65hBnAvYiCpY54UNze5ilgjqtpQGH/ih/HAqmoXNuyz0c2JrjK4XVHq+TH +iurA1nXn2HjnPIo2ttrS2BXJ4HDdHBAaNaZKD/mSLDyY6eXffwhqiS0XMJbmbhSD +3FyfcICpZTLBkWeOavgCwS/qH96eNRYFqUpvZB7GPPH18wvefT2GaYXj6CntF1mQ +4t+BHJHTsRPV+obtDBV1YJOGsv0+707Kdhxewot8ibDBsBJ1D9iu5klhe6G7nNzB +lopJMIz2G/k/oFuugMa5ePPgxjBaon803oh/VfvhEG0ATYXniAJL0Ustdi00hzJq +tWc7Ji+CTRmUQ4IUsnPTOFttQETS7TGr0ynbsTeNyuBpMGHGoLNJ9zeLb5sdsFD2 +3w9ET6qDxPiBtmM5PLKO/mSXFbSwioj5QoPODYrwTIYAUyZE8BGyeNl0hAUFGgkc +HuWnudrVjjKKtBJQ7dSgAkXL4P7EPKb3eXBO0tsKxEiSFXc8gAkhY98iE+Ni1rUM +n13zZQKLf1f6OPeSZBD2ywNLyh7EcahBjH+Utg7u6oYG0JFfzEi0JbkhR8KrTNTX +aXaDnvHhDOa/mOw4HX0yc94tE7yi+/X26VlyAeMXUdqz6G6btVI= +=p5QY +-----END PGP SIGNATURE----- diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch index ed736bf..6a4e247 100644 --- a/meson-test-installed-bin.patch +++ b/meson-test-installed-bin.patch @@ -1,7 +1,8 @@ -diff -Nur meson-0.62.1/run_tests.py new/run_tests.py ---- meson-0.62.1/run_tests.py 2022-04-23 11:53:34.000000000 +0200 -+++ new/run_tests.py 2022-04-23 14:30:53.079730407 +0200 -@@ -175,18 +175,10 @@ +Index: meson-1.0.1/run_tests.py +=================================================================== +--- meson-1.0.1.orig/run_tests.py ++++ meson-1.0.1/run_tests.py +@@ -196,18 +196,10 @@ def get_meson_script() -> str: Also used by run_unittests.py to determine what meson to run when not running in-process (which is the default). ''' @@ -22,22 +23,16 @@ diff -Nur meson-0.62.1/run_tests.py new/run_tests.py def get_backend_args_for_dir(backend: Backend, builddir: str) -> T.List[str]: ''' -@@ -356,12 +348,12 @@ +@@ -381,12 +373,6 @@ def main(): # Can't pass arguments to unit tests, so set the backend to use in the environment env = os.environ.copy() if not options.cross: - cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] - if options.failfast: - cmd += ['--failfast'] -- returncode += subprocess.call(cmd, env=env) +- returncode += subprocess_call(cmd, env=env) - if options.failfast and returncode != 0: - return returncode -+ #cmd = mesonlib.python_command + ['run_meson_command_tests.py', '-v'] -+ #if options.failfast: -+ # cmd += ['--failfast'] -+ #returncode += subprocess.call(cmd, env=env) -+ #if options.failfast and returncode != 0: -+ # return returncode if no_unittests: print('Skipping all unit tests.') print(flush=True) diff --git a/meson.changes b/meson.changes index e0385df..fe7a6d6 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 25 16:14:07 UTC 2023 - Andreas Stieger + +- meson 1.0.1: + + clang-cl (13) now accepts cpp_std=c++20 + + a sizable collection of bug fixes + ------------------------------------------------------------------- Thu Jan 5 04:43:00 UTC 2023 - Luciano Santos diff --git a/meson.spec b/meson.spec index 1b8f430..fb81ab0 100644 --- a/meson.spec +++ b/meson.spec @@ -24,13 +24,12 @@ %define name_ext %{nil} %bcond_with test %endif - -%bcond_with setuptools -%bcond_without mono %define _name mesonbuild %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} +%bcond_with setuptools +%bcond_without mono Name: meson%{name_ext} -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -53,12 +52,12 @@ BuildRequires: python3-setuptools Requires: python3-setuptools %endif %if "%{flavor}" != "test" -BuildArch: noarch Requires: ninja >= 1.8.2 Requires: python3-base >= 3.7 # meson-gui was last used in openSUSE Leap 42.1. Provides: meson-gui = %{version} Obsoletes: meson-gui < %{version} +BuildArch: noarch %else BuildRequires: bison BuildRequires: clang @@ -110,9 +109,9 @@ BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} < 1550 +BuildRequires: libboost_python-devel # Leap / SLE 15.x BuildRequires: python2-PyYAML -BuildRequires: libboost_python-devel BuildRequires: python2-devel %endif %if %{with mono}