commit: 248f0e2ca5692bf87be4ca9959082c54d56bc8a1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 2 15:21:12 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 24 15:00:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248f0e2c
games-sports/dustrac: drop 2.1.1 Closes: https://bugs.gentoo.org/962043 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-sports/dustrac/Manifest | 1 - games-sports/dustrac/dustrac-2.1.1.ebuild | 74 ----------- .../dustrac-2.1.1-cmake-add_library-static.patch | 49 ------- .../dustrac/files/dustrac-2.1.1-cmake.patch | 118 ----------------- .../dustrac/files/dustrac-2.1.1-cmake4.patch | 143 --------------------- .../files/dustrac-2.1.1-cmake_policy_0100.patch | 25 ---- 6 files changed, 410 deletions(-) diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest index fa0eba60491c..aaf1a253590a 100644 --- a/games-sports/dustrac/Manifest +++ b/games-sports/dustrac/Manifest @@ -1,2 +1 @@ -DIST dustrac-2.1.1.tar.gz 17392345 BLAKE2B 2efc82b0552f202aa1f248278f61d4ea17ac9d3d652b17de69a1888e09147c0c2659c90ce6bdced9cd361d99ff4fc179f4a6aa703c45f8eabf25aa69fb516bbf SHA512 9a49cd0302ab47b12ee587a33cc74c1df2bf6cf7925141cbf957fc90a5c1a34423d4420be28bcb6909a862daa12d6214b397fd0fc77e9e18fa649f3ca5c2e1ab DIST dustrac-2.1.1_p20250924-73617c08.tar.gz 17390002 BLAKE2B 8c3a75e58126f9d580207eccb7cebf2789a9d072a507aa2650e5807d8eea3a47d870134ea47f0cda70222b349003f221a6729ed5d5f244c23c8a44308438d945 SHA512 2b1c389ff73ff7cb0327d6cd00628924eaf8699aef5f4a550436bb9029a10d8f21536f4310673b155bf980165b30649b6ec12cddcdf1a0b7f3d84c15cb331fec diff --git a/games-sports/dustrac/dustrac-2.1.1.ebuild b/games-sports/dustrac/dustrac-2.1.1.ebuild deleted file mode 100644 index 316100b2692f..000000000000 --- a/games-sports/dustrac/dustrac-2.1.1.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 - -inherit cmake xdg - -DESCRIPTION="Tile-based, cross-platform 2D racing game" -HOMEPAGE="https://juzzlin.github.io/DustRacing2D/"; -SRC_URI="https://github.com/juzzlin/DustRacing2D/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/DustRacing2D-${PV}" - -LICENSE="GPL-3+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-fonts/ubuntu-font-family - media-libs/libvorbis - media-libs/openal - virtual/opengl -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - # upstream backports - "${FILESDIR}"/${P}-cmake_policy_0100.patch - # downstream patches - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-cmake-add_library-static.patch - "${FILESDIR}"/${P}-cmake4.patch -) - -src_configure() { - # -DGLES=ON didn't build for me but maybe just need use flags on some Qt package? - # Maybe add a local gles use flag - local mycmakeargs=( - -DReleaseBuild=ON - -DSystemFonts=ON - -DOpenGL_GL_PREFERENCE=GLVND - -DDATA_PATH=/usr/share/${PN} - -DBIN_PATH=/usr/bin - -DDOC_PATH=/usr/share/doc/${PF} - -DBUILD_TESTING=$(usex test) - ) - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - cmake_src_test -} - -src_install() { - cmake_src_install - - dosym ../../fonts/ubuntu-font-family/UbuntuMono-B.ttf /usr/share/${PN}/fonts/UbuntuMono-B.ttf - dosym ../../fonts/ubuntu-font-family/UbuntuMono-R.ttf /usr/share/${PN}/fonts/UbuntuMono-R.ttf -} diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch deleted file mode 100644 index 41673036f9ed..000000000000 --- a/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9ba17dd402db811a89ea3b77b13898ee2c5a8de1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 27 Aug 2025 19:38:33 +0200 -Subject: [PATCH] Fix linking with BUILD_SHARED_LIBS=ON default in EAPI-7 - ---- - src/game/MTFH/CMakeLists.txt | 2 +- - src/game/MiniCore/src/CMakeLists.txt | 2 +- - src/game/STFH/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/game/MTFH/CMakeLists.txt b/src/game/MTFH/CMakeLists.txt -index 613d786..689b08e 100644 ---- a/src/game/MTFH/CMakeLists.txt -+++ b/src/game/MTFH/CMakeLists.txt -@@ -10,5 +10,5 @@ set(MTFHSRC - menumanager.cpp - menuitemview.cpp) - --add_library(MTFH ${MTFHSRC}) -+add_library(MTFH STATIC ${MTFHSRC}) - set_property(TARGET MTFH PROPERTY CXX_STANDARD 11) -diff --git a/src/game/MiniCore/src/CMakeLists.txt b/src/game/MiniCore/src/CMakeLists.txt -index 68e5653..de19d0f 100644 ---- a/src/game/MiniCore/src/CMakeLists.txt -+++ b/src/game/MiniCore/src/CMakeLists.txt -@@ -88,7 +88,7 @@ set(MiniCoreSRC ${MiniCoreSRC} Graphics/contrib/glew/glew.c) - endif() - - set(MiniCoreTargetName MiniCore) --add_library(${MiniCoreTargetName} ${MiniCoreSRC}) -+add_library(${MiniCoreTargetName} STATIC ${MiniCoreSRC}) - target_link_libraries(${MiniCoreTargetName} Qt5::Core Qt5::OpenGL Qt5::Xml ${MINICORE_OPENGL_LIBS}) - set_property(TARGET ${MiniCoreTargetName} PROPERTY CXX_STANDARD 14) - -diff --git a/src/game/STFH/CMakeLists.txt b/src/game/STFH/CMakeLists.txt -index 1f50ce1..2674a6c 100644 ---- a/src/game/STFH/CMakeLists.txt -+++ b/src/game/STFH/CMakeLists.txt -@@ -10,5 +10,5 @@ set(STFHSRC - source.cpp - ) - --add_library(STFH ${STFHSRC}) -+add_library(STFH STATIC ${STFHSRC}) - set_property(TARGET STFH PROPERTY CXX_STANDARD 11) --- -2.51.0 - diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch deleted file mode 100644 index 28c0585be709..000000000000 --- a/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 463844b7742c98e336bdbeaf30026b27e62cbde7 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 27 Aug 2025 19:32:52 +0200 -Subject: [PATCH] Fix CMake for our purpose - -Do not override CFLAGS -Drop COPYING file -Use CTest module for standard BUILD_TESTING switch and make Qt5Test optional - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 14 ++++++++------ - InstallLinux.cmake | 2 +- - src/game/CMakeLists.txt | 4 +++- - src/game/MiniCore/CMakeLists.txt | 3 --- - src/game/MiniCore/src/CMakeLists.txt | 4 +++- - 5 files changed, 15 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef09505..d2457ac 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -101,6 +101,9 @@ endif() - add_definitions(-DGLEW_STATIC) - add_definitions(-DGLEW_NO_GLU) - -+# Enable CMake's unit test framework -+include(CTest) -+ - if(UNIX) - include("InstallLinux.cmake") - elseif(WIN32) -@@ -108,8 +111,7 @@ elseif(WIN32) - endif() - - if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") -- add_compile_options("$<$<CONFIG:RELEASE>:-W;-Wall;-O3;-pedantic;-fomit-frame-pointer>") -- add_compile_options("$<$<CONFIG:DEBUG>:-W;-Wall;-O0;-pedantic>") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") - - # Automatically use ccache if found - find_program(CCACHE_FOUND ccache) -@@ -136,7 +138,10 @@ find_package(Qt5Xml ${QT_MIN_VER} REQUIRED) - find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) - find_package(Qt5LinguistTools ${QT_MIN_VER} REQUIRED) - find_package(Qt5Sql ${QT_MIN_VER} REQUIRED) --find_package(Qt5Test ${QT_MIN_VER} REQUIRED) -+ -+if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VER} REQUIRED) -+endif() - - # Find OpenGL - find_package(OpenGL REQUIRED) -@@ -173,9 +178,6 @@ include_directories(src/contrib/SimpleLogger/src) - add_subdirectory(src/contrib/Argengine EXCLUDE_FROM_ALL) - include_directories(src/contrib/Argengine/src) - --# Enable CMake's unit test framework --enable_testing() -- - # Install paths depend on the build type and target platform - resolve_install_paths() - -diff --git a/InstallLinux.cmake b/InstallLinux.cmake -index 3c4806f..346305f 100644 ---- a/InstallLinux.cmake -+++ b/InstallLinux.cmake -@@ -78,7 +78,7 @@ function(setup_install_targets BIN_PATH DATA_PATH DOC_PATH) - install(FILES data/editorModels.conf DESTINATION ${DATA_PATH}) - install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) - install(FILES data/surfaces.conf DESTINATION ${DATA_PATH}) -- install(FILES AUTHORS CHANGELOG COPYING README.md DESTINATION ${DOC_PATH}) -+ install(FILES AUTHORS CHANGELOG README.md DESTINATION ${DOC_PATH}) - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") - install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") -diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt -index 8368e2c..b8a5a61 100644 ---- a/src/game/CMakeLists.txt -+++ b/src/game/CMakeLists.txt -@@ -169,4 +169,6 @@ set(COMMON_LIBS - target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Sql Qt5::Xml ${DUSTRAC_OPENGL_LIBS} SimpleLogger_static Argengine_static) - set_property(TARGET ${GAME_BINARY_NAME} PROPERTY CXX_STANDARD 14) - --add_subdirectory(unittests) -+if(BUILD_TESTING) -+ add_subdirectory(unittests) -+endif() -diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt -index 2707310..ff983d3 100644 ---- a/src/game/MiniCore/CMakeLists.txt -+++ b/src/game/MiniCore/CMakeLists.txt -@@ -63,8 +63,5 @@ else() - set(MINICORE_OPENGL_LIBS OpenGL::GL) - endif() - --# Enable CMake's unit test framework --enable_testing() -- - add_subdirectory(src) - -diff --git a/src/game/MiniCore/src/CMakeLists.txt b/src/game/MiniCore/src/CMakeLists.txt -index 5c4d05f..68e5653 100644 ---- a/src/game/MiniCore/src/CMakeLists.txt -+++ b/src/game/MiniCore/src/CMakeLists.txt -@@ -92,5 +92,7 @@ add_library(${MiniCoreTargetName} ${MiniCoreSRC}) - target_link_libraries(${MiniCoreTargetName} Qt5::Core Qt5::OpenGL Qt5::Xml ${MINICORE_OPENGL_LIBS}) - set_property(TARGET ${MiniCoreTargetName} PROPERTY CXX_STANDARD 14) - --add_subdirectory(UnitTests) -+if(BUILD_TESTING) -+ add_subdirectory(UnitTests) -+endif() - --- -2.51.0 - diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch deleted file mode 100644 index 4b4e1cce9cb0..000000000000 --- a/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 8cf9a0b40918ff1c53630779c584164b0c2d9d8a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 27 Aug 2025 20:00:42 +0200 -Subject: [PATCH] Raise CMake minimum to 3.11 - -Use BUILD_TESTING also in bundled libs. - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 11 +++-------- - src/contrib/Argengine/CMakeLists.txt | 12 +++--------- - src/contrib/SimpleLogger/CMakeLists.txt | 12 +++--------- - src/game/MiniCore/CMakeLists.txt | 9 ++------- - 4 files changed, 11 insertions(+), 33 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d2457ac..0cc8369 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,6 @@ --project(DustRacing2D) -+cmake_minimum_required(VERSION 3.11) - --cmake_minimum_required(VERSION 2.8.12) --cmake_policy(VERSION 2.8.12) -+project(DustRacing2D) - - # Use cmake --help-policy [POLICY] for more information about these: - -@@ -145,11 +144,7 @@ endif() - - # Find OpenGL - find_package(OpenGL REQUIRED) --if(${CMAKE_VERSION} VERSION_LESS "3.11.0") -- set(DUSTRAC_OPENGL_LIBS ${OPENGL_gl_LIBRARY}) --else() -- set(DUSTRAC_OPENGL_LIBS OpenGL::GL) --endif() -+set(DUSTRAC_OPENGL_LIBS OpenGL::GL) - - # OpenAL for sounds. OpenAL directory can be given by -DOPENALDIR=... - set(ENV{OPENALDIR} ${OpenALDir}) -diff --git a/src/contrib/Argengine/CMakeLists.txt b/src/contrib/Argengine/CMakeLists.txt -index 8d4705e..7bf8caf 100644 ---- a/src/contrib/Argengine/CMakeLists.txt -+++ b/src/contrib/Argengine/CMakeLists.txt -@@ -1,9 +1,8 @@ - project(Argengine) - --cmake_minimum_required(VERSION 2.8.12) --cmake_policy(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.11) - --option(BUILD_TESTS "Build unit tests" OFF) -+option(BUILD_TESTING "Build unit tests" OFF) - - option(BUILD_EXAMPLES "Build example apps" OFF) - -@@ -18,18 +17,13 @@ set(CMAKE_CXX_STANDARD 11) - - if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") -- -- # CMAKE_CXX_STANDARD supported only by versions >= 3.1 -- if (CMAKE_VERSION VERSION_LESS "3.1") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -- endif () - endif() - - set(LIBRARY_NAME "Argengine") - - set(CMAKE_INCLUDE_CURRENT_DIR ON) - --if(BUILD_TESTS) -+if(BUILD_TESTING) - enable_testing() - add_subdirectory(src/tests) - endif() -diff --git a/src/contrib/SimpleLogger/CMakeLists.txt b/src/contrib/SimpleLogger/CMakeLists.txt -index 810a17a..9db40db 100644 ---- a/src/contrib/SimpleLogger/CMakeLists.txt -+++ b/src/contrib/SimpleLogger/CMakeLists.txt -@@ -1,9 +1,8 @@ - project(SimpleLogger) - --cmake_minimum_required(VERSION 2.8.12) --cmake_policy(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.11) - --option(BUILD_TESTS "Build unit tests" OFF) -+option(BUILD_TESTING "Build unit tests" OFF) - - # Default to release C++ flags if CMAKE_BUILD_TYPE not set - if(NOT CMAKE_BUILD_TYPE) -@@ -17,18 +16,13 @@ set(CMAKE_CXX_STANDARD 11) - if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") -- -- # CMAKE_CXX_STANDARD supported only by versions >= 3.1 -- if (CMAKE_VERSION VERSION_LESS "3.1") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -- endif () - endif() - - set(LIBRARY_NAME "SimpleLogger") - - set(CMAKE_INCLUDE_CURRENT_DIR ON) - --if(BUILD_TESTS) -+if(BUILD_TESTING) - enable_testing() - add_subdirectory(src/tests) - endif() -diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt -index ff983d3..ae5b0e7 100644 ---- a/src/game/MiniCore/CMakeLists.txt -+++ b/src/game/MiniCore/CMakeLists.txt -@@ -1,7 +1,6 @@ - project(MiniCore) - --cmake_minimum_required(VERSION 2.8.12) --cmake_policy(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.11) - - if(POLICY CMP0005) - cmake_policy(SET CMP0005 NEW) -@@ -57,11 +56,7 @@ find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) - - # Find OpenGL - find_package(OpenGL REQUIRED) --if(${CMAKE_VERSION} VERSION_LESS "3.11.0") -- set(MINICORE_OPENGL_LIBS ${OPENGL_gl_LIBRARY}) --else() -- set(MINICORE_OPENGL_LIBS OpenGL::GL) --endif() -+set(MINICORE_OPENGL_LIBS OpenGL::GL) - - add_subdirectory(src) - --- -2.51.0 - diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch deleted file mode 100644 index 88c5fd2e8dd1..000000000000 --- a/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2c00334135aa004213758a0121a23a872660aa79 Mon Sep 17 00:00:00 2001 -From: Jussi Lind <[email protected]> -Date: Sat, 28 Jan 2023 12:55:15 +0200 -Subject: [PATCH] Set CMake policy CMP0100 to NEW - ---- - src/game/MiniCore/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt -index 27073103..07430201 100644 ---- a/src/game/MiniCore/CMakeLists.txt -+++ b/src/game/MiniCore/CMakeLists.txt -@@ -19,6 +19,11 @@ if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) - endif() - -+# Automoc for .hh -+if(POLICY CMP0100) -+ cmake_policy(SET CMP0100 NEW) -+endif() -+ - option(GLES "Build for OpenGL ES 2.0" OFF) - - option(NO_GLEW "Don't use GLEW to resolve OpenGL extensions if enabled." ON)
