Accepting request 1225964 from devel:tools:building

- Add meson-testsuite-with-cmake-3.31.patch: Fix test suite run
  against CMake 3.31.

OBS-URL: https://build.opensuse.org/request/show/1225964
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=116

meson-1.5.1.tar.gz

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

meson-1.5.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmak4oAACgkQwk5jG6ux
-/nCJUA/+O88rZPlqCawXxRZ9iE3I//Arki3LIyptf6VQKmA/oiv9OIy1H+LozkQ/
-/lCSrNKsGqz6hdlemZ036I2WYK+vN8q7zx1kadLM8eM5de0ZmgIFH0u0qbyNyqKR
-NHTw/pP2mY6c2V7ST34kYXLFxJqzn4WsnZIVh6rJSVEsjtCHgM5pjaCPKkcYmSLO
-Vj2uwMkKOoFr3bshohdxpKdzWTXQGEwZkqQmBeQlayVmtTnWDDbEZ42jkY4+DSsL
-1G4/WM1+e7CoI5YWgGwFdFPe0O37Cq8ljPtS9mOgq7oWSfcAB3p7Vv20Krjn8r3L
-cbxpFUllIhgaCHTQ+MQbWbtALpXb97/XiQs2iL5zDgYxBCOZhb8B7A2YmgXBsLzq
-4jtfwVh5Dl26yWXDAlngZWvS9Iu8DD4ITOkKbrSMLCicd5/rBO0PPGMdGnDh1cSA
-7IOSMtiH4Cvg18MWlQ0masPTxSk700u/vHpagdJZlQzYFut3qfBSUFXNfsLrDjrs
-vwYauHv4Pw5z0zAsFELZJe6yxoE1n4I79xrqp8L6bE5RsVjbmPWTcEhmopqJ98EP
-HI6KwY3gBz152lDcnHlQ8u3auW1qQA2Ur3CiljWJaZnT1x0rcqIxOvXCLe8RXxxn
-nw292/9IP/gbOjXYNxNEi0s3PQfjctzhwzmfMTKLH8VOgHMCJvc=
-=qc8Q
------END PGP SIGNATURE-----

meson-1.6.0.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmcVUvAACgkQwk5jG6ux
+/nAxlw/9FujH49x68WLJb/vjBBQrA5GOGBy9Qt2iet559auLySqlWNr5PGWDNlRo
+2rvdCC0NfJOQkqgHqDpGE8+f0MxL670AHyDYxfwXb3NxR+bCzxSbr/isYeei0Ejq
+0GlbpuViZH3gC/pWWrkbcdgBbewk8g3CfdWcywUkrSPh5LGv+NFE7thMd5K/+w2h
+ePDS87s2NUxOProX+kTav6yMcS8vnRFUpg6AY/UIODVNbAs/fqy4a53m+kF4C1+1
+z70UGug3x4tRnmPNiUZ9yV0S/HWrrPNWifq/4neB8PNjrRWbzkgsYyuIQkS6sPD2
+z0ZnccTb3l0le/6r+sCJqA/LGPK/hji6uP3YUxPy+FrdCm2Lhq7zVsT0By0VsmcO
+heJeNx83rZDZjY+aTL3KHKTU5H83xK3MCwgbv9rzFytY+AzNrLpKQ9Iv5eUo4jgN
+HMabygqyKY2FQEVCmHPAKyA5PyW/qWNkft2fRuxvEl1f7sf51jqaYlvNyIwolnGB
+eN3uaY99X/FWGgkl4zIIMQDZ6UUlrfYZJwpZ6m9m/0euT7auSBTcxJE+IQz+LTMC
+ysfBpsMblYR0gu5epwBQTY10N6DpfEXEs8SKalWhM5zu0TDfwgmJ4Yrd5sxA0ri4
+wcyy1mjc5n/mHZL91uJKOmXknQzDms6ohWhVYD0ZOPXLvZj56/A=
+=Ga7S
+-----END PGP SIGNATURE-----

meson-testsuite-with-cmake-3.31.patch

@@ -0,0 +1,14 @@
+diff --git c/mesonbuild/cmake/interpreter.py i/mesonbuild/cmake/interpreter.py
+index fafee86ab..12d7049d2 100644
+--- c/mesonbuild/cmake/interpreter.py
++++ i/mesonbuild/cmake/interpreter.py
+@@ -828,6 +828,7 @@ class CMakeInterpreter:
+ 
+         cmake_args = []
+         cmake_args += cmake_get_generator_args(self.env)
++        cmake_args += ['-DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE']
+         cmake_args += [f'-DCMAKE_INSTALL_PREFIX={self.install_prefix}']
+         cmake_args += extra_cmake_options
+         if not any(arg.startswith('-DCMAKE_BUILD_TYPE=') for arg in cmake_args):
+
+

meson.changes

@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Fri Nov 22 09:21:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add meson-testsuite-with-cmake-3.31.patch: Fix test suite run
+  against CMake 3.31.
+
+-------------------------------------------------------------------
+Mon Oct 21 06:52:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update ro version 1.6.0:
+  + Support for OpenXL compiler in AIX.
+  + Default to printing deprecations when no minimum version is
+    specified.
+  + Cargo subprojects is experimental.
+  + Dependencies from CMake subprojects now use only PUBLIC link
+    flags.
+  + New built-in option for default both_libraries.
+  + New as_static and as_shared methods on internal dependencies.
+  + Support for DIA SDK.
+  + Support for LLVM-based flang compiler.
+  + nvc and nvc++ now support setting std.
+  + Tools can be selected when calling has_tools() on the Qt
+    modules.
+  + Simple tool to test build reproducibility.
+  + Support for variable in system dependencies.
+  + test() and benchmark() functions accept new types.
+  + Zig 0.11 can be used as a C/C++ compiler frontend.
+
+-------------------------------------------------------------------
+Mon Sep 23 06:03:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 1.5.2:
+  + compilers: do not strip '-isystem' from C build arguments.
+  + Prevent raw exception during project().
+  + compilers: Pass mode to determine_args, not its string value.
+  + nasm: Use different test sources for x86 and x86_64.
+
+-------------------------------------------------------------------
+Mon Aug 19 11:34:30 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- BuildRequire gettext-devel instead of gettext: allow OBS to
+  shortcut through gettext-runtime-mini.
+
 -------------------------------------------------------------------
 Sat Jul 27 20:50:09 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 

meson.spec

@@ -36,7 +36,7 @@
 %bcond_with     setuptools
 %bcond_without  mono
 Name:           meson%{name_ext}
-Version:        1.5.1
+Version:        1.6.0
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -51,6 +51,8 @@ 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 meson-testsuite-with-cmake-3.31.patch -- Fix test suite when using CMake 3.31
+Patch3:         meson-testsuite-with-cmake-3.31.patch
 
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  fdupes
@@ -89,7 +91,7 @@ BuildRequires:  gcc-fortran >= 12
 BuildRequires:  gcc-obj-c++ >= 12
 BuildRequires:  gcc-objc >= 12
 %endif
-BuildRequires:  gettext
+BuildRequires:  gettext-devel
 BuildRequires:  git
 BuildRequires:  gmock
 BuildRequires:  gnustep-make
@@ -102,6 +104,8 @@ BuildRequires:  libboost_python3-devel
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module gobject}
 BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  libboost_python3-devel
+BuildRequires:  libboost_regex-devel
 BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_test-devel
 BuildRequires:  libboost_thread-devel
@@ -186,6 +190,7 @@ Vim/NeoVim.
 %if !%{with setuptools}
 %patch -P 2 -p1
 %endif
+%patch -P 3 -p1
 
 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
 # AddressSanitizer fails here because of ulimit.