commit: 71e0f9a9fd8a1330a170f9ceb749ae4345effaf3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Nov 27 19:25:45 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 20:30:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e0f9a9
games-strategy/megaglest: Fix build w/ cmake-4 Upstream git master is already at 3.15 and 3.10 (Windows or else) respectively, the little extra step should be fine. Maybe pass the info on to upstream that it really is fine to depend on a CMake version released in 2019. While a 3.14 release appears to be in the (slow) works, we don't know how long it will really take them. Closes: https://bugs.gentoo.org/964656 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../megaglest/files/megaglest-3.13.0-cmake4.patch | 19 +++++++++++++++++++ games-strategy/megaglest/megaglest-3.13.0-r5.ebuild | 15 +++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/games-strategy/megaglest/files/megaglest-3.13.0-cmake4.patch b/games-strategy/megaglest/files/megaglest-3.13.0-cmake4.patch new file mode 100644 index 000000000000..2aa6236eee89 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.13.0-cmake4.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 ) ++CMAKE_MINIMUM_REQUIRED( VERSION 3.16 ) + PROJECT( MegaGlest ) + + #SET(CMAKE_VERBOSE_MAKEFILE ON) +@@ -14,10 +14,6 @@ + ENDIF() + SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS None Debug Release RelWithDebInfo MinSizeRel) + +-IF(NOT CMAKE_VERSION VERSION_LESS "3.1") +- cmake_policy(SET CMP0054 NEW) +-ENDIF() +- + # add additional CMake modules + MESSAGE(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}") + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/mk/cmake/Modules) diff --git a/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild b/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild index 1fc08de29159..108f0f374121 100644 --- a/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild +++ b/games-strategy/megaglest/megaglest-3.13.0-r5.ebuild @@ -33,8 +33,7 @@ IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_s REQUIRED_USE="${LUA_REQUIRED_USE}" -COMMON_DEPEND=" - ${LUA_DEPS} +DEPEND="${LUA_DEPS} dev-libs/libxml2:= dev-libs/xerces-c:=[icu] media-libs/fontconfig @@ -60,19 +59,19 @@ COMMON_DEPEND=" model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}=[X] ) videos? ( media-video/vlc ) " -DEPEND="${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} +RDEPEND="${DEPEND} ~games-strategy/${PN}-data-${PV} " - -BDEPEND="sys-apps/help2man +BDEPEND=" + sys-apps/help2man virtual/pkgconfig editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} )" + model-viewer? ( ${VIRTUALX_DEPEND} ) +" PATCHES=( "${FILESDIR}/${PN}-3.11.1-cmake-lua.patch" + "${FILESDIR}/${P}-cmake4.patch" # bug 964656 # From Fedora and Arch "${FILESDIR}/${P}-underlink.patch"
