commit: e90735bea192798208048c14c3e128a5adf7ff2b Author: G-Src <gsrc <AT> fsfans <DOT> club> AuthorDate: Thu Jul 31 12:26:32 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Sep 2 21:57:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90735be
games-action/supertuxkart: fix build issue under CMake >=4.0 Signed-off-by: G-Src <gsrc <AT> fsfans.club> Bug: https://bugs.gentoo.org/957294 Part-of: https://github.com/gentoo/gentoo/pull/43260 Closes: https://github.com/gentoo/gentoo/pull/43260 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> ...kart-1.4-0001-Require-Cmake-3.6-or-higher.patch | 93 ++++++++++++++++++++++ ...tuxkart-1.4-0002-Fixed-cmake-4.0-warnings.patch | 82 +++++++++++++++++++ .../supertuxkart/supertuxkart-1.4-r1.ebuild | 2 + 3 files changed, 177 insertions(+) diff --git a/games-action/supertuxkart/files/supertuxkart-1.4-0001-Require-Cmake-3.6-or-higher.patch b/games-action/supertuxkart/files/supertuxkart-1.4-0001-Require-Cmake-3.6-or-higher.patch new file mode 100644 index 000000000000..007be66fe4db --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.4-0001-Require-Cmake-3.6-or-higher.patch @@ -0,0 +1,93 @@ +From 7f67e1ffb599d43cd2316e0320ce7944b49be02e Mon Sep 17 00:00:00 2001 +From: Alayan <[email protected]> +Date: Tue, 21 May 2024 14:06:16 +0200 +Subject: [PATCH 1/2] Require Cmake 3.6 or higher + +This gets rid of deprecation warnings. Cmake 3.6 has been out for almost 8 years by now, so this requirement should not cause undue trouble to people trying to compile the game. + +Signed-off-by: G-Src <[email protected]> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.4) ++cmake_minimum_required(VERSION 3.6.0) + + # root CMakeLists for the SuperTuxKart project + project(SuperTuxKart) +@@ -6,10 +6,6 @@ set(PROJECT_VERSION "1.4") + + add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" ) + +-if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3)) +- cmake_policy(SET CMP0043 OLD) +-endif() +- + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") + include(CMakeDependentOption) + +--- a/lib/enet/CMakeLists.txt ++++ b/lib/enet/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.6.0) + + project(enet) + +--- a/lib/graphics_utils/CMakeLists.txt ++++ b/lib/graphics_utils/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.6.0) + include_directories("${PROJECT_SOURCE_DIR}/lib/simd_wrapper") + if (UNIX OR MINGW) + add_definitions(-O3) +--- a/lib/libsquish/CMakeLists.txt ++++ b/lib/libsquish/CMakeLists.txt +@@ -8,7 +8,7 @@ + # Unix and VS: SSE2 support is enabled by default + # use BUILD_SQUISH_WITH_SSE2 and BUILD_SQUISH_WITH_ALTIVEC to override + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0) + + OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." OFF) + +--- a/lib/mcpp/CMakeLists.txt ++++ b/lib/mcpp/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.6.0) + if (UNIX OR MINGW) + add_definitions(-O3) + if (APPLE) +--- a/lib/tinygettext/CMakeLists.txt ++++ b/lib/tinygettext/CMakeLists.txt +@@ -39,7 +39,7 @@ set(VERSION "0.1.0") + + ### CMake configuration + +-cmake_minimum_required(VERSION 2.4) ++cmake_minimum_required(VERSION 3.6.0) + if(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) + endif(COMMAND cmake_policy) +--- a/lib/wiiuse/CMakeLists.txt ++++ b/lib/wiiuse/CMakeLists.txt +@@ -2,13 +2,7 @@ + # http://academic.cleardefinition.com/ + # Iowa State University HCI Graduate Program/VRAC + +-cmake_minimum_required(VERSION 2.8.0) +- +-# Added for STK, silences CMake warning +-# See https://github.com/supertuxkart/stk-code/commit/b0ff15873ee7fa8901672672b47def9039a5534b#diff-a3e272598233e89e4b577a434cc2a89d +-if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3)) +- cmake_policy(SET CMP0048 OLD) +-endif() ++cmake_minimum_required(VERSION 3.6.0) + + # Set package properties + project(WiiUse) +-- +2.50.1 + diff --git a/games-action/supertuxkart/files/supertuxkart-1.4-0002-Fixed-cmake-4.0-warnings.patch b/games-action/supertuxkart/files/supertuxkart-1.4-0002-Fixed-cmake-4.0-warnings.patch new file mode 100644 index 000000000000..655a5483c3ff --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.4-0002-Fixed-cmake-4.0-warnings.patch @@ -0,0 +1,82 @@ +From e2aaf730de5d43afaf4e2b2ed1a94e8c0eeb11e2 Mon Sep 17 00:00:00 2001 +From: Deve <[email protected]> +Date: Thu, 15 May 2025 17:54:28 +0200 +Subject: [PATCH 2/2] Fixed cmake 4.0 warnings + +Signed-off-by: G-Src <[email protected]> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + + # root CMakeLists for the SuperTuxKart project + project(SuperTuxKart) +--- a/lib/angelscript/projects/cmake/CMakeLists.txt ++++ b/lib/angelscript/projects/cmake/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.5...4.0) + + # STK Fix llvm mingw crashes + if (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_SIZEOF_VOID_P EQUAL 4) +--- a/lib/enet/CMakeLists.txt ++++ b/lib/enet/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + + project(enet) + +--- a/lib/graphics_utils/CMakeLists.txt ++++ b/lib/graphics_utils/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + include_directories("${PROJECT_SOURCE_DIR}/lib/simd_wrapper") + if (UNIX OR MINGW) + add_definitions(-O3) +--- a/lib/libsquish/CMakeLists.txt ++++ b/lib/libsquish/CMakeLists.txt +@@ -8,7 +8,7 @@ + # Unix and VS: SSE2 support is enabled by default + # use BUILD_SQUISH_WITH_SSE2 and BUILD_SQUISH_WITH_ALTIVEC to override + +-CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.6.0...4.0) + + OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." OFF) + +--- a/lib/mcpp/CMakeLists.txt ++++ b/lib/mcpp/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + if (UNIX OR MINGW) + add_definitions(-O3) + if (APPLE) +--- a/lib/tinygettext/CMakeLists.txt ++++ b/lib/tinygettext/CMakeLists.txt +@@ -39,7 +39,7 @@ set(VERSION "0.1.0") + + ### CMake configuration + +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + if(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) + endif(COMMAND cmake_policy) +--- a/lib/wiiuse/CMakeLists.txt ++++ b/lib/wiiuse/CMakeLists.txt +@@ -2,7 +2,7 @@ + # http://academic.cleardefinition.com/ + # Iowa State University HCI Graduate Program/VRAC + +-cmake_minimum_required(VERSION 3.6.0) ++cmake_minimum_required(VERSION 3.6.0...4.0) + + # Set package properties + project(WiiUse) +-- +2.50.1 + diff --git a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild index a1bcb8135cd1..38aee17e377e 100644 --- a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild +++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild @@ -57,6 +57,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3-irrlicht-system-libs.patch "${FILESDIR}"/${P}-gcc-13.patch "${FILESDIR}"/${P}-gcc-15.patch + "${FILESDIR}"/${P}-0001-Require-Cmake-3.6-or-higher.patch + "${FILESDIR}"/${P}-0002-Fixed-cmake-4.0-warnings.patch ) src_configure() {
