commit: 82293df31d1032ea4ceb1c865026a8ab8544c81c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 14 21:16:04 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 16 12:24:45 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82293df3
games-arcade/supertux: drop 0.6.3-r2 Bug: https://bugs.gentoo.org/965064 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-arcade/supertux/Manifest | 1 - .../files/supertux-0.5.0-tinygettext.patch | 30 --------- .../supertux/files/supertux-0.6.0-icon.patch | 11 ---- .../supertux/files/supertux-0.6.0-license.patch | 11 ---- .../supertux/files/supertux-0.6.0-obstack.patch | 19 ------ .../supertux/files/supertux-0.6.3-cmake4.patch | 55 ---------------- .../files/supertux-0.6.3-missing-include.patch | 10 --- .../supertux-0.6.3-squirrel-CVE-2021-41556.patch | 36 ----------- .../supertux-0.6.3-squirrel-CVE-2022-30292.patch | 21 ------ games-arcade/supertux/supertux-0.6.3-r2.ebuild | 74 ---------------------- 10 files changed, 268 deletions(-) diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest index 58b835c97047..e88a09eb7aba 100644 --- a/games-arcade/supertux/Manifest +++ b/games-arcade/supertux/Manifest @@ -1,2 +1 @@ -DIST SuperTux-v0.6.3-Source.tar.gz 182065428 BLAKE2B c4acbe2c61306e6e462a375205b4e95af174c87dbc391f15211e1fac365ab51147d7a83d20a90e35f7d7a994c72b560631ddf1686fee2e1f937f97a711fb1003 SHA512 c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798 DIST SuperTux-v0.7.0-beta.1-Source.tar.gz 289516602 BLAKE2B f47fb1614d9b27a20e335d7edccab7c147c247f17b18cba3af9be304f271c390ae0767688e217bc0223856621f5296498b38a8603b5d76dfae80f7f0e480d571 SHA512 589d7abd07e0e5dad48edafad5f8d7d55077f1872a31460956d7e633cc35168ffa3bd6c44dbb2c5e3d6a6ee354a8c4e97b312f8b728fddf8fbd9578ead62c73f diff --git a/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch deleted file mode 100644 index 3bedc38eb803..000000000000 --- a/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt -+++ SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt -@@ -59,7 +59,7 @@ - ) - - ## Reveal library type choice to users --option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" ON) -+option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" OFF) - - # TinyGetText library compilation - -@@ -128,17 +128,7 @@ - ## Debug options - - option(WERROR "Stops on first compiler warning in debug mode" OFF) --option(WARNINGS "Enable long list of warnings for compiler to check" ON) -- --CHECK_CXX_FLAG(std=c++0x) --CHECK_CXX_FLAG(O3) --IF(NOT MSVC) -- #MSVC is excessivly verbose when Wall is activated -- CHECK_CXX_FLAG(Wall) --ENDIF() --CHECK_CXX_FLAG(Wextra) --CHECK_CXX_FLAG(Weffc++) --CHECK_CXX_FLAG(pedantic) -+option(WARNINGS "Enable long list of warnings for compiler to check" OFF) - - if(WARNINGS) - CHECK_CXX_FLAG(Wabi) diff --git a/games-arcade/supertux/files/supertux-0.6.0-icon.patch b/games-arcade/supertux/files/supertux-0.6.0-icon.patch deleted file mode 100644 index aac503c8cc9c..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.0-icon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SuperTux-v0.6.0-Source/CMakeLists.txt -+++ SuperTux-v0.6.0-Source/CMakeLists.txt -@@ -846,7 +846,7 @@ - install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN}) - endif() - -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION ".") -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION ".") - - option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" OFF) - diff --git a/games-arcade/supertux/files/supertux-0.6.0-license.patch b/games-arcade/supertux/files/supertux-0.6.0-license.patch deleted file mode 100644 index 600a3fd0c962..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.0-license.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SuperTux-v0.6.0-Source/CMakeLists.txt -+++ SuperTux-v0.6.0-Source/CMakeLists.txt -@@ -895,7 +895,7 @@ - install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} DESTINATION ${INSTALL_SUBDIR_BIN}) - endif() - --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC}) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC}) - - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION ${INSTALL_SUBDIR_SHARE}) - diff --git a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch deleted file mode 100644 index a46ca3afd12d..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- SuperTux-v0.6.0-Source/CMakeLists.txt -+++ SuperTux-v0.6.0-Source/CMakeLists.txt -@@ -470,7 +470,6 @@ - include_directories(${CMAKE_BINARY_DIR}/) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/) - include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) --include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) - include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/) - include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/) - -@@ -481,7 +480,7 @@ - - ## Build list of sources for supertux binary - --file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c) -+file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c) - - file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp) - file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc") diff --git a/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch b/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch deleted file mode 100644 index 725d3b64ffa9..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.3-cmake4.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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/files/supertux-0.6.3-missing-include.patch b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch deleted file mode 100644 index 4515c9a6003f..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/external/partio_zip/zip_manager.hpp -+++ b/external/partio_zip/zip_manager.hpp -@@ -41,6 +41,7 @@ - #ifndef __ZIP__ - #define __ZIP__ - -+#include <memory> - #include <fstream> - #include <iostream> - #include <map> diff --git a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch deleted file mode 100644 index a63e7a6c4e69..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 Mon Sep 17 00:00:00 2001 -From: albertodemichelis <[email protected]> -Date: Thu, 16 Sep 2021 22:36:53 +0800 -Subject: [PATCH] check max member count in class - ---- - squirrel/sqclass.cpp | 3 +++ - squirrel/sqclass.h | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/squirrel/sqclass.cpp b/squirrel/sqclass.cpp -index fc619616..53a29763 100644 ---- a/external/squirrel/squirrel/sqclass.cpp -+++ b/external/squirrel/squirrel/sqclass.cpp -@@ -61,6 +61,9 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr - _defaultvalues[_member_idx(temp)].val = val; - return true; - } -+ if (_members->CountUsed() >= MEMBER_MAX_COUNT) { -+ return false; -+ } - if(belongs_to_static_table) { - SQInteger mmidx; - if((sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE) && -diff --git a/squirrel/sqclass.h b/squirrel/sqclass.h -index 7d402172..60d3d21b 100644 ---- a/external/squirrel/squirrel/sqclass.h -+++ b/external/squirrel/squirrel/sqclass.h -@@ -17,6 +17,7 @@ typedef sqvector<SQClassMember> SQClassMemberVec; - - #define MEMBER_TYPE_METHOD 0x01000000 - #define MEMBER_TYPE_FIELD 0x02000000 -+#define MEMBER_MAX_COUNT 0x00FFFFFF - - #define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD) - #define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD) diff --git a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch deleted file mode 100644 index 0a605616d606..000000000000 --- a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a6413aa690e0bdfef648c68693349a7b878fe60d Mon Sep 17 00:00:00 2001 -From: Alberto Demichelis <[email protected]> -Date: Mon, 2 May 2022 12:04:58 +0200 -Subject: [PATCH] fix in thread.call - ---- - squirrel/sqbaselib.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/external/squirrel/squirrel/sqbaselib.cpp b/external/squirrel/squirrel/sqbaselib.cpp -index 8eff97c..5055f18 100644 ---- a/external/squirrel/squirrel/sqbaselib.cpp -+++ b/external/squirrel/squirrel/sqbaselib.cpp -@@ -1149,6 +1149,7 @@ static SQInteger thread_call(HSQUIRRELVM v) - SQObjectPtr o = stack_get(v,1); - if(sq_type(o) == OT_THREAD) { - SQInteger nparams = sq_gettop(v); -+ sq_reservestack(_thread(o), nparams + 3); - _thread(o)->Push(_thread(o)->_roottable); - for(SQInteger i = 2; i<(nparams+1); i++) - sq_move(_thread(o),v,i); diff --git a/games-arcade/supertux/supertux-0.6.3-r2.ebuild b/games-arcade/supertux/supertux-0.6.3-r2.ebuild deleted file mode 100644 index de6a0fbffcfc..000000000000 --- a/games-arcade/supertux/supertux-0.6.3-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_QA_COMPAT_SKIP=1 -inherit cmake xdg - -MY_PV="${PV/_rc/-rc.}" -MY_P="SuperTux-v${MY_PV}-Source" - -DESCRIPTION="A game similar to Super Mario Bros" -HOMEPAGE="https://www.supertux.org"; -SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"; -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire -# content of ${HOME} to ${HOME}/.local/share/supertux2/ -# DO NOT REMOVE THIS BLOCKER!!! See bug #764959 -RDEPEND=" - !=media-libs/libsdl2-2.0.14-r0 - >=dev-games/physfs-3.0 - dev-libs/boost:=[nls] - media-libs/freetype - media-libs/glew:= - media-libs/libpng:0= - >=media-libs/libsdl2-2.0.1[joystick,video] - media-libs/libvorbis - media-libs/openal - >=media-libs/sdl2-image-2.0.0[png,jpeg] - >=net-misc/curl-7.21.7 - virtual/opengl -" -DEPEND="${RDEPEND} - media-libs/glm" -BDEPEND=" - virtual/pkgconfig - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch - "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch - "${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() { - local mycmakeargs=( - -DWERROR=OFF - -DINSTALL_SUBDIR_BIN=bin - -DINSTALL_SUBDIR_DOC=share/doc/${PF} - -DINSTALL_SUBDIR_SHARE=share/${PN}2 - -DENABLE_SQDBG="$(usex debug)" - -DUSE_SYSTEM_PHYSFS=ON - -DIS_SUPERTUX_RELEASE=ON - -DBUILD_TESTS="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - # Assumes in-source build to find test data - local -x GTEST_FILTER="-IFileStreamTest.test" - cmake_src_test -}
