commit: 7ee9d9bedde9c202f0cdce76c1888e81dbc5d70e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 1 20:34:02 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 1 20:42:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee9d9be
dev-lang/mono: Fix build w/ cmake-4 https://gitlab.winehq.org/mono/mono/-/commit/831415ed https://gitlab.winehq.org/mono/boringssl/-/commit/2153da68 Closes: https://bugs.gentoo.org/957434 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/mono-6.12.0.199-boringssl-cmake4.patch | 22 +++++++++++++++ dev-lang/mono/files/mono-6.12.0.199-cmake4.patch | 32 ++++++++++++++++++++++ dev-lang/mono/mono-6.12.0.199-r2.ebuild | 3 +- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dev-lang/mono/files/mono-6.12.0.199-boringssl-cmake4.patch b/dev-lang/mono/files/mono-6.12.0.199-boringssl-cmake4.patch new file mode 100644 index 000000000000..ea9c4c86fce3 --- /dev/null +++ b/dev-lang/mono/files/mono-6.12.0.199-boringssl-cmake4.patch @@ -0,0 +1,22 @@ +From 2153da68cbe3a3afe5416b4373edc7a64146da13 Mon Sep 17 00:00:00 2001 +From: Esme Povirk <[email protected]> +Date: Fri, 11 Apr 2025 18:01:12 +0000 +Subject: [PATCH] CMakeLists: Fix build on cmake 4.0. + +--- + external/boringssl/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/boringssl/CMakeLists.txt b/external/boringssl/CMakeLists.txt +index eaa59401d..6d8b06e15 100644 +--- a/external/boringssl/CMakeLists.txt ++++ b/external/boringssl/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.8.10) ++cmake_minimum_required (VERSION 2.8.10...4.0) + + # Defer enabling C and CXX languages. + project (BoringSSL NONE) +-- +GitLab + diff --git a/dev-lang/mono/files/mono-6.12.0.199-cmake4.patch b/dev-lang/mono/files/mono-6.12.0.199-cmake4.patch new file mode 100644 index 000000000000..ef39f8090811 --- /dev/null +++ b/dev-lang/mono/files/mono-6.12.0.199-cmake4.patch @@ -0,0 +1,32 @@ +From 831415edd2a578a2b4851996ca796f47dbc3f2f3 Mon Sep 17 00:00:00 2001 +From: Esme Povirk <[email protected]> +Date: Fri, 11 Apr 2025 18:08:04 +0000 +Subject: [PATCH] btls: Fix build on cmake 4.x. + +--- + mono/btls/CMakeLists.txt | 9 +-------- + 1 files changed, 1 insertions(+), 8 deletions(-) + +diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt +index 992f41e4c7f..dbad836fc27 100644 +--- a/mono/btls/CMakeLists.txt ++++ b/mono/btls/CMakeLists.txt +@@ -1,14 +1,7 @@ +-cmake_minimum_required (VERSION 2.8.10) ++cmake_minimum_required (VERSION 2.8.10...4.0) + + project (mono-btls) + +-if(POLICY CMP0026) +- cmake_policy(SET CMP0026 NEW) +-endif() +-if(POLICY CMP0042) +- cmake_policy(SET CMP0042 NEW) +-endif() +- + enable_language(C) + enable_language(CXX) + +-- +GitLab + diff --git a/dev-lang/mono/mono-6.12.0.199-r2.ebuild b/dev-lang/mono/mono-6.12.0.199-r2.ebuild index 0e9e15766cb6..9325e610a8a1 100644 --- a/dev-lang/mono/mono-6.12.0.199-r2.ebuild +++ b/dev-lang/mono/mono-6.12.0.199-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.12-try-catch.patch "${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch "${FILESDIR}"/${PN}-6.12.0.199-configure-c99.patch + "${FILESDIR}"/${PN}-6.12.0.199-{,boringssl-}cmake4.patch # bug 957434, fixed in git main branch ) pkg_pretend() {
