[gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7abe7d00b4fa7030be79f3da11cd35d0a9ae25e6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 20:34:19 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 20 21:08:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abe7d00

games-engines/openmw: drop 0.48.0

Closes: https://bugs.gentoo.org/951571
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-engines/openmw/Manifest                      |   1 -
 games-engines/openmw/files/openmw-0.48.0-Xt.patch  |  17 --
 .../openmw/files/openmw-0.48.0-gcc14.patch         |  34 ----
 games-engines/openmw/openmw-0.48.0.ebuild          | 185 ---------------------
 4 files changed, 237 deletions(-)

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index a5b19fe55729..539fa0a61682 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,2 @@
-DIST openmw-0.48.0.tar.gz 6020423 BLAKE2B 6a6f710f06efc0e844115018365db8148e9f6acefd453df74904144f53f5e896e9ab4d4f563ab95a3231500a2c1a5e1f8c5b6d6ac5c1315805c61657d13a7aa8 SHA512 969c10b285c039b54810c56f202f9c33bd03c83d87fec722c3389525e87fc7104760ea12527be5fb19a3f7ae2dc9aef0e4c6b7375d8bbcd6eb726e1d7859b833
 DIST openmw-49-rc7.tar.gz 5944659 BLAKE2B 40d26904e8b15fe177b822b4edbb57d24215d40dd85869ed75e7d3873683c05d4fd175c5755d25253205d2d5fb2d2dc3caa6c9232f195bb8a3b1a5f9e30d35f1 SHA512 8db599a18e0a9fcacd872b47877be576b6104a04a34efa37d91e3629bdb963fa07e78b296970275330a824e416527a163f81253ebeb2b802a28b633823c5981f
 DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730 BLAKE2B bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e SHA512 6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6

diff --git a/games-engines/openmw/files/openmw-0.48.0-Xt.patch b/games-engines/openmw/files/openmw-0.48.0-Xt.patch
deleted file mode 100644
index e24516af9155..000000000000
--- a/games-engines/openmw/files/openmw-0.48.0-Xt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.com/OpenMW/openmw/-/merge_requests/4407
-https://bugs.gentoo.org/925582
-
---- a/apps/wizard/CMakeLists.txt
-+++ b/apps/wizard/CMakeLists.txt
-@@ -98,11 +98,6 @@ if (BUILD_WITH_CODE_COVERAGE)
-   target_link_libraries(openmw-wizard gcov)
- endif()
- 
--# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
--if (CMAKE_SYSTEM_NAME MATCHES "Linux")
--target_link_libraries(openmw-wizard dl Xt)
--endif()
--
- if (WIN32)
-     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION ".")
- endif(WIN32)

diff --git a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch b/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
deleted file mode 100644
index d1214339ee2d..000000000000
--- a/games-engines/openmw/files/openmw-0.48.0-gcc14.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix build with gcc 14
-https://bugs.gentoo.org/925105
-
---- a/components/bsa/bsa_file.cpp
-+++ b/components/bsa/bsa_file.cpp
-@@ -26,6 +26,7 @@
- #include <components/files/constrainedfilestream.hpp>
- 
- #include <cassert>
-+#include <algorithm>
- 
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/fstream.hpp>
---- a/apps/openmw/mwstate/charactermanager.hpp
-+++ b/apps/openmw/mwstate/charactermanager.hpp
-@@ -1,6 +1,8 @@
- #ifndef GAME_STATE_CHARACTERMANAGER_H
- #define GAME_STATE_CHARACTERMANAGER_H
-
-+#include <list>
-+
- #include <boost/filesystem/path.hpp>
-
- #include "character.hpp"
---- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
-+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
-@@ -13,6 +13,7 @@
- 
- #include <algorithm>
- #include <type_traits>
-+#include <iomanip>
- 
- namespace
- {

diff --git a/games-engines/openmw/openmw-0.48.0.ebuild b/games-engines/openmw/openmw-0.48.0.ebuild
deleted file mode 100644
index 0ca8e595f5d7..000000000000
--- a/games-engines/openmw/openmw-0.48.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua-single readme.gentoo-r1 xdg
-
-DESCRIPTION="Open source reimplementation of TES III: Morrowind"
-HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenMW/openmw.git"
-else
-	SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-MY_TEMPLATE_COMMIT="8966dab24692555eec720c854fb0f73d108070cd"
-SRC_URI+="
-	test? ( https://gitlab.com/OpenMW/example-suite/-/raw/${MY_TEMPLATE_COMMIT}/data/template.omwgame -> openmw-template-${MY_TEMPLATE_COMMIT}.omwgame )
-"
-
-LICENSE="GPL-3 MIT BitstreamVera ZLIB"
-SLOT="0"
-IUSE="doc devtools +osg-fork test +qt5"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
-# used when BUILD_OPENCS flag is enabled. See bug #676266.
-
-RDEPEND="${LUA_DEPS}
-	app-arch/lz4:=
-	>=dev-games/mygui-3.4.1
-	<dev-games/mygui-3.4.3
-	dev-cpp/yaml-cpp:=
-	dev-db/sqlite:3
-	dev-games/recastnavigation:=
-	dev-libs/boost:=[zlib]
-	dev-libs/icu:=
-	dev-libs/tinyxml[stl]
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/openal
-	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=[double-precision]
-	virtual/opengl
-	osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] )
-	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),jpeg,png,sdl,svg,truetype,zlib] )
-	qt5? (
-		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/sol2
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		dev-python/sphinx
-	)
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/openmw-0.48.0-gcc14.patch"
-	"${FILESDIR}/openmw-0.48.0-Xt.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Use the system tinyxml headers
-	rm -v extern/oics/tiny{str,xml}* || die
-	rm -rv extern/sol3 || die
-}
-
-src_configure() {
-	use devtools && ! use qt5 &&
-		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
-
-	local mycmakeargs=(
-		-DBUILD_BSATOOL=$(usex devtools)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_ESMTOOL=$(usex devtools)
-		-DBUILD_LAUNCHER=$(usex qt5)
-		-DBUILD_NIFTEST=$(usex devtools)
-		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
-		-DBUILD_WIZARD=$(usex qt5)
-		-DBUILD_UNITTESTS=$(usex test)
-		-DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
-		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
-		-DUSE_SYSTEM_TINYXML=ON
-		-DOPENMW_USE_SYSTEM_GOOGLETEST=ON
-		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
-	)
-
-	if [[ ${ELUA} == luajit ]]; then
-		mycmakeargs+=(
-			-DUSE_LUAJIT=ON
-		)
-	else
-		mycmakeargs+=(
-			-DUSE_LUAJIT=OFF
-			-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
-			-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
-			-DLua_FIND_VERSION_COUNT=2
-			-DLua_FIND_VERSION_EXACT=ON
-		)
-	fi
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/apps/openmw_test_suite/data || die
-		cp "${DISTDIR}"/openmw-template-${MY_TEMPLATE_COMMIT}.omwgame \
-			"${BUILD_DIR}"/apps/openmw_test_suite/data/template.omwgame || die
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_src_compile doc
-		find "${BUILD_DIR}"/docs/Doxygen/html \
-			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. )
-	fi
-}
-
-src_test() {
-	# Lua 5.x is supported in theory, but don't work as well, the test fails
-	# Upstream recommends luajit, but it has less arch coverage
-	if [[ ${ELUA} != luajit ]]; then
-		elog "Skipping tests on ${ELUA}"
-		return
-	fi
-	pushd "${BUILD_DIR}" > /dev/null || die
-	./openmw_test_suite || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake_src_install
-
-	local DOC_CONTENTS="
-	You need the original Morrowind data files. If you haven't
-	installed them yet, you can install them straight via the
-	installation wizard which is the officially supported method
-	(either by using the launcher or by calling 'openmw-wizard'
-	directly).\n"
-
-	if ! use qt5; then
-		DOC_CONTENTS+="\n\n
-		USE flag 'qt5' is disabled, 'openmw-launcher' and
-		'openmw-wizard' are not available. You are on your own for
-		making the Morrowind data files available and pointing
-		openmw at them.\n\n
-		Additionally; you must import the Morrowind.ini file before
-		running openmw with the Morrowind data files for the first
-		time. Typically this can be done like so:\n\n
-		\t mkdir -p ~/.config/openmw\n
-		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}