diff --git a/meson-testsuite-with-cmake-3.31.patch b/meson-testsuite-with-cmake-3.31.patch deleted file mode 100644 index 5dbef07..0000000 --- a/meson-testsuite-with-cmake-3.31.patch +++ /dev/null @@ -1,14 +0,0 @@ -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): - - diff --git a/meson.changes b/meson.changes index 9b68b87..95c1475 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 10 14:17:35 UTC 2024 - Dominique Leuenberger + +- Drop meson-testsuite-with-cmake-3.31.patch: the actual fix was + done in CMake 3.31.2. + ------------------------------------------------------------------- Fri Dec 6 11:11:56 UTC 2024 - Dominique Leuenberger diff --git a/meson.spec b/meson.spec index 3240990..f4c7d53 100644 --- a/meson.spec +++ b/meson.spec @@ -51,10 +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 # PATCH-FIX-UPSTREAM -- Fix test suite with rust 1.83 -Patch4: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/13935.patch +Patch3: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/13935.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes @@ -193,7 +191,6 @@ Vim/NeoVim. %patch -P 2 -p1 %endif %patch -P 3 -p1 -%patch -P 4 -p1 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 # AddressSanitizer fails here because of ulimit.