rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 1056157 from GNOME:Next

Browse Source 
Update to meson 1.0.0

OBS-URL: https://build.opensuse.org/request/show/1056157
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=241
This commit is contained in:
Dominique Leuenberger 2023-01-05 12:06:56 +00:00 committed by Git OBS Bridge
parent 878e9e53d7
commit ebca97aad1
8 changed files with 74 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extend-test-timeout-on-qemu-builds.patch
View File

@ -1,5 +1,7 @@
--- meson-0.63.1/data/macros.meson
+++ meson-0.63.1/data/macros.meson
Index: b/data/macros.meson
===================================================================
--- a/data/macros.meson
+++ b/data/macros.meson
@@ -42,4 +42,5 @@
-C %{_vpath_builddir} \
--num-processes %{_smp_build_ncpus} \

3
meson-0.64.1.tar.gz
View File

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

16
meson-0.64.1.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmN9SK0ACgkQwk5jG6ux
/nAQNxAAqmTMetMX5Mt2Te23dH0JnqK+xr4ld7dKcsAcJ0/V+PLsvg+v9ZmM5Z1P
eUdzDjBjyXof+obJGiUy7D7QGXQUcKIK4CqrhjczsUl7i5SiXSi0NGtROoXs2Z3T
045NujKyjf+3agQzJhYepkw9s2Ky5MmR6vYL/meZj8G9fTjrHNQ/BmIqmDgfX98A
sFTHdaI794DJAvHEZSRtK4heoUz73Hh0w5gIb8X9XJbR+tp+qPJQdJS9QJwc0b1L
0v+AYWIHpAlXDzzI+jqAmGDD5xUeC9NbUemIX6W89wOBTUi1OG2VpWyAIqtB1+k1
6lCjSEdDYuNkIObk4JoUEhuhmHIqTFdwmcrcV3hPS/TchzI598XJcX8v0b9ch1Us
ln56AagX5viclHXNMi1r6L4dzHp57MIMt1DpfRuHHJAKY7hBV/vVXYs+23Y3YuEQ
uJochVhC4r+IVjlzLS0TeYwTNUsqpcqambK5IuRTVIbD8fE6zQG3murpqVQoJ0eU
Bxw74S9MZxPMPjDRV3aQmgmEzhv0W9rFP6T5ueOPG+brIcOVX4tloYyHlT3IWN9m
dz2KFNB24/8+u/Po/1t0RnG8wKuF9F7TA4Y7R+zHjywyZGjkC6wG4MzvpfB3WGEn
jfBhytPCn30OLApJXHdzooAFNfXVvlLZQW4i5zAtAcbFPEG7S2I=
=lWbr
-----END PGP SIGNATURE-----

3
meson-1.0.0.tar.gz Normal file
View File

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

16
meson-1.0.0.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----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-----

30
meson-distutils.patch
View File

@ -1,16 +1,8 @@
diff -Nur meson-0.62.1/MANIFEST.in new/MANIFEST.in
--- meson-0.62.1/MANIFEST.in 2022-04-20 17:32:16.000000000 +0200
+++ new/MANIFEST.in 2022-04-26 16:59:11.579219774 +0200
@@ -17,3 +17,5 @@
include run_meson_command_tests.py
include run_project_tests.py
include meson.py
+
+include mesonbuild/dependencies/data/*.txt
diff -Nur meson-0.62.1/setup.py new/setup.py
--- meson-0.62.1/setup.py 2022-04-20 17:32:16.000000000 +0200
+++ new/setup.py 2022-04-26 16:58:46.507097203 +0200
@@ -20,7 +20,7 @@
Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ if sys.version_info < (3, 7):
raise SystemExit('ERROR: Tried to install Meson with an unsupported Python version: \n{}'
'\nMeson requires Python 3.7.0 or greater'.format(sys.version))
@ -19,7 +11,7 @@ diff -Nur meson-0.62.1/setup.py new/setup.py
data_files = []
if sys.platform != 'win32':
@@ -28,4 +28,16 @@
@@ -28,4 +28,16 @@ if sys.platform != 'win32':
data_files = [('share/man/man1', ['man/meson.1']),
('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])]
@ -37,3 +29,13 @@ diff -Nur meson-0.62.1/setup.py new/setup.py
+ package_data={'mesonbuild.dependencies.data': ['mesonbuild/dependencies/data/*.txt']},
+ data_files=data_files,
+)
Index: b/MANIFEST.in
===================================================================
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,3 +17,5 @@ include run_unittests.py
include run_meson_command_tests.py
include run_project_tests.py
include meson.py
+
+include mesonbuild/dependencies/data/*.txt

24
meson.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Jan 5 04:43:00 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
- Update to version 1.0.0:
+ The compiler check functions "prefix" kwargs now accepts
arrays.
+ Flags removed from cpp/objcpp warning level 1:
"-Wnon-virtual-dtor" is no longer implied by "meson setup
-Dwarning_level=1".
+ There has been some developer environment improvements.
+ Rename "java.generate_native_headers" to "java.native_headers".
The former is deprecated now.
+ "rust.bindgen" now accepts a dependency argument.
+ The Rust module is marked as stable now.
+ "warning-level=everything" option: The new "everything" value
for the built-in "warning_level" enables roughly all applicable
compiler warnings. For Clang, this simply enables
"-Weverything". For GCC, Meson enables warnings approximately
equivalent to "-Weverything" from Clang.
+ Plese see https://mesonbuild.com/Release-notes-for-1-0-0.html
for full release notes.
- Remove shebang from mesonbuild/scripts/cmake_run_ctgt.py, this
file is not supposed to be directly callable.
-------------------------------------------------------------------
Wed Nov 23 09:03:45 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

17
meson.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,7 +30,7 @@
%define _name mesonbuild
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
Name: meson%{name_ext}
Version: 0.64.1
Version: 1.0.0
Release: 0
Summary: Python-based build system
License: Apache-2.0
@ -133,7 +133,7 @@ Java, Rust. Build definitions are written in a non-turing complete
Domain Specific Language.
%package vim
Summary: Vim support for meson.build files
Summary: Vim syntax highlighting support for meson.build files
Group: Productivity/Text/Editors
Requires: vim
Supplements: (vim and %{name})
@ -147,7 +147,8 @@ CCache and the like. Supported languages include C, C++, Fortran,
Java, Rust. Build definitions are written in a non-turing complete
Domain Specific Language.
This package provides support for meson.build files in Vim.
This package provides meson.build syntax highlighting support for
Vim/NeoVim.
%prep
%setup -q -n meson-%{version}
@ -163,10 +164,14 @@ rm -r "test cases/frameworks/1 boost" \
"test cases/objc/2 nsstring"
# AddressSanitizer fails here because of ulimit.
sed -i "/def test_generate_gir_with_address_sanitizer/s/$/\n raise unittest.SkipTest('ulimit')/" run_unittests.py
sed -i "/def test_generate_gir_with_address_sanitizer/{
s/$/\n raise unittest.SkipTest('ulimit')/;
}" run_unittests.py
# Remove hashbang from non-exec script
sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py
sed -i '1{/\/usr\/bin\/env/d;}' \
./mesonbuild/rewriter.py \
./mesonbuild/scripts/cmake_run_ctgt.py
# remove gtest check that actually works because our gtest has .pc files
rm -rf test\ cases/failing/85\ gtest\ dependency\ with\ version