commit: 3eec424f9641054388e1757ce00e9bc1b08a6aab Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun May 25 20:56:13 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun May 25 20:56:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eec424f
games-arcade/supertux: Patch to build with CMake 4.0, add icon caching Closes: https://bugs.gentoo.org/955493 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../supertux/files/supertux-0.6.3-cmake4.patch | 55 ++++++++++++++++++++++ games-arcade/supertux/supertux-0.6.3-r2.ebuild | 5 +- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch b/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch new file mode 100644 index 000000000000..725d3b64ffa9 --- /dev/null +++ b/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch @@ -0,0 +1,55 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,12 +34,12 @@ + + ## Project name to use as command prefix. + ++cmake_minimum_required(VERSION 3.1...4.0) + project(SUPERTUX) + + + ### CMake configuration + +-cmake_minimum_required(VERSION 3.1) + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + cmake_policy(SET CMP0008 NEW) +--- a/external/SDL_ttf/CMakeLists.txt ++++ b/external/SDL_ttf/CMakeLists.txt +@@ -1,6 +1,6 @@ + # Taken from https://github.com/Microsoft/vcpkg/blob/2ad118a2532e99a78c41dffa1b9648e7eca20a95/ports/sdl2-ttf/CMakeLists.txt + +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...4.0) + project(SDL2_TTF C) + + find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +--- a/external/squirrel/CMakeLists.txt ++++ b/external/squirrel/CMakeLists.txt +@@ -1,7 +1,7 @@ + if(MSVC) + cmake_minimum_required(VERSION 3.4) + else() +- cmake_minimum_required(VERSION 2.8) ++ cmake_minimum_required(VERSION 2.8...4.0) + endif() + + set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}" CACHE PATH "") +--- a/external/tinygettext/CMakeLists.txt ++++ b/external/tinygettext/CMakeLists.txt +@@ -30,6 +30,7 @@ + # make + # + ++cmake_minimum_required(VERSION 2.4...4.0) + cmake_policy(SET CMP0005 NEW) + + ## Project name to use as command prefix +@@ -39,7 +40,6 @@ + + ### CMake configuration + +-cmake_minimum_required(VERSION 2.4) + if(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) + endif(COMMAND cmake_policy) diff --git a/games-arcade/supertux/supertux-0.6.3-r2.ebuild b/games-arcade/supertux/supertux-0.6.3-r2.ebuild index 2126e741ddad..cd4b63b9dd52 100644 --- a/games-arcade/supertux/supertux-0.6.3-r2.ebuild +++ b/games-arcade/supertux/supertux-0.6.3-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 #: ${CMAKE_MAKEFILE_GENERATOR:=emake} -inherit cmake +inherit cmake xdg MY_PV="${PV/_rc/-rc.}" MY_P="SuperTux-v${MY_PV}-Source" @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.6.3-missing-include.patch "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2021-41556.patch "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch + "${FILESDIR}"/${PN}-0.6.3-cmake4.patch ) src_configure() {
