commit: 1eb52b83992988a07aa4d94cf21de08714737d8b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 16:33:43 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Oct 1 19:27:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb52b83
dev-games/ois: update EAPI 7 -> 8, fix build w/ cmake-4 Closes: https://bugs.gentoo.org/954105 Closes: https://bugs.gentoo.org/957227 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-games/ois/files/ois-1.5.1-cmake4.patch | 41 ++++++++++++++++++++++++++++++ dev-games/ois/ois-1.5.1.ebuild | 7 +++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dev-games/ois/files/ois-1.5.1-cmake4.patch b/dev-games/ois/files/ois-1.5.1-cmake4.patch new file mode 100644 index 000000000000..443f1805bc74 --- /dev/null +++ b/dev-games/ois/files/ois-1.5.1-cmake4.patch @@ -0,0 +1,41 @@ +Source: https://github.com/wgois/OIS/pull/98 + +From b71eafcb2e95c909b93d23937c420eab8a31536d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <[email protected]> +Date: Tue, 8 Jul 2025 19:35:59 +0200 +Subject: [PATCH] Require CMake 3.10 or newer + +CMake 4.0 refuses to work with minimum +require of CMake 3.4 or below. Everything +below 3.10 is deprecated. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 951b2b1..98c67d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10) + project(OIS) + + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CmakeModules) + + +* asturm 2025-10-01: How did that ever work? +Gentoo-bug: https://bugs.gentoo.org/954105#c9 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,8 +188,7 @@ + if(UNIX) + + if (NOT APPLE) +- add_dependencies(OIS X11) +- target_link_libraries(OIS X11) ++ target_link_libraries(OIS ${X11_LIBRARIES}) + endif() + + set_target_properties(OIS PROPERTIES diff --git a/dev-games/ois/ois-1.5.1.ebuild b/dev-games/ois/ois-1.5.1.ebuild index 3c0948fdfda6..30a989ca11da 100644 --- a/dev-games/ois/ois-1.5.1.ebuild +++ b/dev-games/ois/ois-1.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -19,3 +19,6 @@ DEPEND=" x11-libs/libX11 " RDEPEND="${DEPEND}" + +# bug 954105, plus downstream cmake fix ... +PATCHES=( "${FILESDIR}/${P}-cmake4.patch" )
