Accepting request 1114723 from GNOME:Next

Update to 1.2.2

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

get_llvm_tool_names-llvm17.patch

@@ -1,22 +0,0 @@
-From d0b09898c703f6c10ec5a6b2aeace0df2e3570aa Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 23 Sep 2023 17:21:43 +0200
-Subject: [PATCH] get_llvm_tool_names: add llvm 17
-
-this fixes the "frameworks: 15 llvm" tests with llvm 17
----
- mesonbuild/environment.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 53cb1206fef..5c7d78b9028 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -157,6 +157,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
-     # unless it becomes a stable release.
-     suffixes = [
-         '', # base (no suffix)
-+        '-17',  '17',
-         '-16',  '16',
-         '-15',  '15',
-         '-14',  '14',

meson-1.2.1.tar.gz

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

meson-1.2.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmTRhO0ACgkQwk5jG6ux
-/nAhGg/9EI0RSiqodhwX90X92D5LGm9e6AFjfpo7wTJ36us1fVlW4JY16QQWUIJD
-/MXWy7+KZQFdqZzyEdGU8IvB5z1Lx/qOXJlb7TUZ7P41UR555afeodTIjc2MFn9R
-0ps6uAN8RH17CJJfTPWTe7VUZdrJUio2dh1QznI5dyyZ+9RNg2Za/qksQ86v//Vj
-KhBDiMvVjPc+p1+cWjhXL5Nq9eE14VlCBZ4EseCc6Sfu42HnFozTwDiIlhG8XsTy
-Mqzd1LCpOeAIslU4D8q+8nzY7DntrLHA6JhEaaOQX34ygESCK+cdGPO3vHbcQx0v
-CrLvrDRvDCkRPqtwC/3fZr1SDWaRP27bDePt+DW88KPYjcMw7mwLO8saOE/96Yi3
-boos4ia4OFc1xcuvhVBtDg+HXb3Mi4lkbrdIABfC6h/FGhqnEtfaV+MLIXja30ph
-Uw9XEgE7uN6TPpNRCjjeFOyQwPA/xoQ82Dnrys/Wuwsd3UIhLjzZrvvZcnTHghCZ
-tmuD2HUuLNmNC8tZ5JDE/vG1djMNtE4Aj95PVg8F4qcuacjSS8CGVX+eVVkxMOqh
-C+u25yAkjFQqqnWye1WI2EGlGQQ8n5Bg4EUYlgqbYTdN2hxka71f7c23nBcRSMhF
-DXddnkJoCmE50qKmPadV9EHmDNJ4pkIYk4eJMag1zbnaudHlGWs=
-=t/Mx
------END PGP SIGNATURE-----

meson-1.2.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmUWn/oACgkQwk5jG6ux
+/nDSZA//Yu372PjppqIJ0JXyS6krSFD6huPLo40SE0dKKbrDs1EUdhZp8DI8Dpz8
+kGKZtNuYrFZk6Fnp0B8HBt8FeJptxLeNutsJ/y92cwiMYWbLliC6Go9/bCptbqPk
+P23KfmpBDF4D3qu7iZvLZJKoDQVgl+U2o1W8jrqA8ymyCApP79DhxExGnQ492gV2
+XCZwnMm7LkOkf+PplkfnMDjKmRVGzIiq4t830CVLJ3JT8qDO4/Ka6Dhf0wj7lGDJ
+pJzQ7NypiIO/GaxM9erq9zoU7kpplXP73yL4zCvd3WeNcBUFFovcXOp1Wj2Io+h+
+1QFfzEk9d2nKfi1ibv1ury9BJi+6NSKKtmEjL8NetyMCGjhM1+XPmQlqp/xebQ0q
+3Ak57qcjXtUAXkZ7h0SSCUokKgBMauD7PHhYhl4EDpTJqcfQK4a69Fuznnz1DLpD
+h+8ZuhA4cAyDhCTZpMsMskk9oUcB6llAPbOP9s5uTOEU8IvEw6RCEpJ6bXLptovP
+SLXiFrOoRW0wtjMW6iuCLNUh2NotRn8JtMDrQLkARBbDfsBVv/RNrI8yZcKRj9+U
+06bWF3UAO8xkRJVyDa7RYcU2rNuLgY7zOenJd9z8i5/Z/lRDBheOlvx8XPlbZPz/
+EoSaK1QTLPMvr7tDwZl2gWREszEfgMLNzruW+0LnCFDdwFSeWi4=
+=Ewma
+-----END PGP SIGNATURE-----

meson.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Oct  2 01:02:34 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Update to version 1.2.2:
+  + ninja backend: fix the automatic restat of outputs when
+    reconfiguring.
+  + Fix completely broken support for static: true with
+    dependency('cuda').
+  + Use cudart_static by default in dependency('cuda').
+  + gnome:
+    - Fix crash in gtkdoc and generate_gir in C++ projects.
+    - Fix glib tool lookup consistency.
+  + compilers: fix compiler detection when the "ccache" string is
+    in the path.
+  + Fix crash when installing a vala library and python sources.
+  + Fix bug with openssl when cmake is missing.
+  + msubprojects: Speedup subproject_dir extraction.
+  + Allow unit test to parse testcase blocks.
+  + Fix assertion raised with invalid option name.
+  + rust:
+    - properly rematerialize static dependencies as well as dynamic
+      ones.
+    - apply global, project, and environment C args to bindgen.
+  + get_llvm_tool_names: add llvm 17.
+  + openmp: add 5.1/5.2, fixes openmp with llvm v17.
+  + Fix bug where all java builds & tests fail to run SanityCheck
+    on JDK11.
+  + Add support for sw_64 CPU family.
+- Drop merged upstream patch: get_llvm_tool_names-llvm17.patch.
+
 -------------------------------------------------------------------
 Sat Sep 23 20:58:26 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 

meson.spec

@@ -35,7 +35,7 @@
 %bcond_with     setuptools
 %bcond_without  mono
 Name:           meson%{name_ext}
-Version:        1.2.1
+Version:        1.2.2
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -50,8 +50,7 @@ Patch0:         meson-test-installed-bin.patch
 Patch1:         extend-test-timeout-on-qemu-builds.patch
 # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
 Patch2:         meson-distutils.patch
-# PATCH-FIX-UPSTREAM get_llvm_tool_names-llvm17.patch -- Accept LLVM 17.
+
-Patch3:         get_llvm_tool_names-llvm17.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -174,7 +173,6 @@ Vim/NeoVim.
 %if !%{with setuptools}
 %patch2 -p1
 %endif
-%patch3 -p1
 
 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
 # AddressSanitizer fails here because of ulimit.