From a83302b9bf11390b10227acd7cd11ef3b9a9fbd8 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 1 May 2026 14:57:58 +0200 Subject: [PATCH] games-misc/solarus-quest-editor: drop 1.6.5 Closes: https://bugs.gentoo.org/953383 Signed-off-by: Andreas Sturmlechner --- games-misc/solarus-quest-editor/Manifest | 1 - ...arus-quest-editor-1.6.5-fix-segfault.patch | 22 -------- .../solarus-quest-editor-1.6.5.ebuild | 55 ------------------- profiles/package.mask | 10 ---- 4 files changed, 88 deletions(-) delete mode 100644 games-misc/solarus-quest-editor/files/solarus-quest-editor-1.6.5-fix-segfault.patch delete mode 100644 games-misc/solarus-quest-editor/solarus-quest-editor-1.6.5.ebuild diff --git a/games-misc/solarus-quest-editor/Manifest b/games-misc/solarus-quest-editor/Manifest index 14f4eebd3ddd..a58aeaffead0 100644 --- a/games-misc/solarus-quest-editor/Manifest +++ b/games-misc/solarus-quest-editor/Manifest @@ -1,2 +1 @@ -DIST solarus-quest-editor-v1.6.5.tar.gz 58066380 BLAKE2B faf6d5a0512e7a3d462326461d400d272534fd7b671318b4fefdf4f4eac05860228542b6e0738cdb2c6a4faf43e5de404f5815ac44ad877340caf015e0673749 SHA512 1c38ce284ebc87289e137fa9703a9fa093b38bc74bc1f89b3e1e53caacac57ffa35e598e8705171c3e5204342d58eacacf28550b4b8834c5ba7a8b5eec052393 DIST solarus-v2.0.3.tar.bz2 70803222 BLAKE2B 9181d117989ba0cbe55b3247bc15ca5c4697a3e1f347fe10df9e233957eec2c076aef1d695e5fd1e8bea53c0711bf3f84099b88ce93226ecc430b06efb295662 SHA512 e761c37fd1cf668f73158f2676e101d2182c6dbd0009d119bd2d453d917bcb8d6255c8054219585a3b8393e3721eaeab997aa832d3aaa3a65e47c394aee486cc diff --git a/games-misc/solarus-quest-editor/files/solarus-quest-editor-1.6.5-fix-segfault.patch b/games-misc/solarus-quest-editor/files/solarus-quest-editor-1.6.5-fix-segfault.patch deleted file mode 100644 index 1e2f1582e2ce..000000000000 --- a/games-misc/solarus-quest-editor/files/solarus-quest-editor-1.6.5-fix-segfault.patch +++ /dev/null @@ -1,22 +0,0 @@ -Solarus quest editor will segfault on startup with -O2 - -See: https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/921ac6170a08dcfe601c7a11ee9f7c85386a4f3f ---- a/src/widgets/main_window.cpp -+++ b/src/widgets/main_window.cpp -@@ -1287,7 +1287,6 @@ void MainWindow::current_editor_changed(int index) { - - Editor* editor = get_current_editor(); - const bool has_editor = editor != nullptr; -- ViewSettings& view_settings = editor->get_view_settings(); - - // Set up toolbar buttons for this editor. - ui.action_cut->setEnabled(has_editor); -@@ -1343,6 +1342,8 @@ void MainWindow::current_editor_changed(int index) { - - if (has_editor) { - -+ ViewSettings& view_settings = editor->get_view_settings(); -+ - connect(&view_settings, &ViewSettings::zoom_changed, - this, &MainWindow::update_zoom); - update_zoom(); diff --git a/games-misc/solarus-quest-editor/solarus-quest-editor-1.6.5.ebuild b/games-misc/solarus-quest-editor/solarus-quest-editor-1.6.5.ebuild deleted file mode 100644 index ed25f0c09438..000000000000 --- a/games-misc/solarus-quest-editor/solarus-quest-editor-1.6.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 luajit ) - -inherit cmake lua-single - -DESCRIPTION="A graphical user interface to create and modify quests for the Solarus engine" -HOMEPAGE="https://www.solarus-games.org" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.com/solarus-games/solarus-quest-editor.git" - EGIT_BRANCH="dev" - inherit git-r3 -else - SRC_URI="https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v${PV}/solarus-quest-editor-v${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/solarus-quest-editor-v${PV}" -fi - -LICENSE="GPL-3+" -SLOT="0" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -# Upstream (and their CMake) claim that all of these are required deps -RDEPEND=" - ${LUA_DEPS} - dev-games/physfs - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - media-libs/libmodplug - >=media-libs/libsdl2-2.0.1[X,joystick,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl2-image[png] - >=media-libs/sdl2-ttf-2.0.12 -" - -DEPEND=" - ${RDEPEND} - ~games-engines/solarus-${PV} -" - -PATCHES=( - "${FILESDIR}/${P}-fix-segfault.patch" -) - -src_configure() { - local mycmakeargs=( -DSOLARUS_USE_LUAJIT="$(usex lua_single_target_luajit)" ) - cmake_src_configure -} diff --git a/profiles/package.mask b/profiles/package.mask index 3a65f04c4c81..afa5c30d66c3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -139,16 +139,6 @@ dev-python/tempest # Removal on 2026-05-11. net-misc/x2goclient -# Andreas Sturmlechner (2026-04-12) -# Depending on Qt5 with solarus-1.6.5 being broken by missing deps and at -# least GCC-15. Bugs #953383 (+ linked see-also bugs), #961916, #962015 -# Both games-rpg/zsdx and games-rpg/zsxd are potentially fixed for Solarus 2.0 -# in git master, but that requires someone motivated enough to try it out. -# Removal on 2026-05-11. - (2026-04-11) # NIH general purpose library. Tests are failing. No revdeps. # Removal on 2026-05-11. Bug #942586.