From 68fabccb5c8267dbf9985ba48cd4e8fc84fb6815 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 18 Mar 2026 20:32:19 +0100 Subject: [PATCH] games-misc/solarus-quest-editor: Add missing dependencies, pin to SLOT 6 Cleanup unnecessary phase function overrides. Bug: https://bugs.gentoo.org/904244 Bug: https://bugs.gentoo.org/953383 Signed-off-by: Andreas Sturmlechner --- .../solarus-quest-editor-2.0.3-r2.ebuild | 63 +++++++++++++++++++ .../solarus-quest-editor-9999.ebuild | 25 ++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 games-misc/solarus-quest-editor/solarus-quest-editor-2.0.3-r2.ebuild diff --git a/games-misc/solarus-quest-editor/solarus-quest-editor-2.0.3-r2.ebuild b/games-misc/solarus-quest-editor/solarus-quest-editor-2.0.3-r2.ebuild new file mode 100644 index 0000000000000..153f524bd94bc --- /dev/null +++ b/games-misc/solarus-quest-editor/solarus-quest-editor-2.0.3-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 luajit ) + +inherit cmake lua-single xdg-utils + +DESCRIPTION="Quest editor for Solarus game engine" +HOMEPAGE="https://www.solarus-games.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/solarus-games/solarus.git" + EGIT_BRANCH="dev" + inherit git-r3 +else + SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.bz2" + S="${WORKDIR}/solarus-v${PV}" + KEYWORDS="~amd64" +fi + +CMAKE_USE_DIR="${S}"/editor + +LICENSE="GPL-3+" +SLOT="0" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + dev-games/physfs + dev-qt/qtbase:6[gui,opengl,widgets] + media-libs/libmodplug + >=media-libs/libsdl2-2.0.1[X,joystick,video] + media-libs/libvorbis + media-libs/openal + media-libs/sdl2-image[png] + >=dev-qt/qlementine-1.4.0 + ~games-engines/solarus-${PV} +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" + +PATCHES=( + "${FILESDIR}/solarus-2.0.3-system-qlementine.patch" +) + +src_configure() { + local mycmakeargs=( + -DSOLARUS_USE_SYSTEM_QLEMENTINE=ON + -DSOLARUS_USE_LOCAL_QLEMENTINE=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-misc/solarus-quest-editor/solarus-quest-editor-9999.ebuild b/games-misc/solarus-quest-editor/solarus-quest-editor-9999.ebuild index 071ec875b3f4e..85dc2cf089d82 100644 --- a/games-misc/solarus-quest-editor/solarus-quest-editor-9999.ebuild +++ b/games-misc/solarus-quest-editor/solarus-quest-editor-9999.ebuild @@ -16,9 +16,12 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.com/solarus-games/solarus/-/archive/v${PV}/solarus-v${PV}.tar.bz2" + S="${WORKDIR}/solarus-v${PV}" KEYWORDS="~amd64" fi +CMAKE_USE_DIR="${S}"/editor + LICENSE="GPL-3+" SLOT="0" @@ -27,7 +30,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} dev-games/physfs - dev-qt/qtbase[gui,widgets] + dev-qt/qtbase:6[gui,opengl,widgets] media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis @@ -36,16 +39,8 @@ RDEPEND=" >=dev-qt/qlementine-1.4.0 ~games-engines/solarus-${PV} " - -DEPEND=" - ${RDEPEND} -" - -if ! [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/solarus-v${PV}" -fi - -CMAKE_USE_DIR=${S}/editor +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( @@ -55,14 +50,6 @@ src_configure() { cmake_src_configure } -src_compile() { - cmake_src_compile -} - -src_install() { - cmake_src_install -} - pkg_postinst() { xdg_icon_cache_update }