commit: c511c6caa22e64e9867ee580bc6ea545f096176f Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Feb 26 03:41:58 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 08:45:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c511c6ca
games-strategy/freeorion: drop 0.5.0.1-r1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-strategy/freeorion/Manifest | 1 - .../files/freeorion-0.5.0.1-boost1.85.patch | 57 --------- .../freeorion/freeorion-0.5.0.1-r1.ebuild | 127 --------------------- 3 files changed, 185 deletions(-) diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index 7d03acdcafe5..dc3267e0dc08 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,2 +1 @@ -DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22 DIST FreeOrion_v0.5.1_Source.tar.gz 154915100 BLAKE2B 5097fed26443cd076d03af05816148bf2923b86d4719b86e4593b1bca383af222db6f105e3b4a4b531188558305140e9999a80c7550959adaa65cf08f5bb6b5e SHA512 253deba1a90bd4fa7e33423e0148b22ee5234e47007fef9cee66d617caaa5794e2a600e057574c79caa7058557d51d290c5161e9dfa3d8dabe4ebc5da85b8233 diff --git a/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch b/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch deleted file mode 100644 index cb7f450ffc37..000000000000 --- a/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://bugs.gentoo.org/932780 -https://github.com/freeorion/freeorion/issues/4897 - -Backport of: https://github.com/freeorion/freeorion/pull/4899/commits ---- a/GG/src/dialogs/FileDlg.cpp -+++ b/GG/src/dialogs/FileDlg.cpp -@@ -11,3 +11,3 @@ - #include <boost/algorithm/string/predicate.hpp> --#include <boost/filesystem/operations.hpp> -+#include <boost/filesystem.hpp> - #include <boost/format.hpp> -@@ -217,3 +217,3 @@ - fs::path filename_path = fs::system_complete(fs::path(m_init_filename)); -- m_files_edit->SetText(filename_path.leaf().string()); -+ m_files_edit->SetText(filename_path.filename().string()); - } -@@ -550,3 +550,3 @@ - if ((s_working_dir.string() != s_working_dir.root_path().string() && -- !s_working_dir.branch_path().string().empty()) || -+ !s_working_dir.parent_path().string().empty()) || - Win32Paths()) -@@ -696,6 +696,6 @@ - if (s_working_dir.string() != s_working_dir.root_path().string() && -- !s_working_dir.branch_path().string().empty()) -+ !s_working_dir.parent_path().string().empty()) - { - // move to new directory -- SetWorkingDirectory(s_working_dir.branch_path()); -+ SetWorkingDirectory(s_working_dir.parent_path()); - ---- a/util/Directories.cpp -+++ b/util/Directories.cpp -@@ -6,5 +6,4 @@ - #include <boost/algorithm/string/trim.hpp> --#include <boost/filesystem/convenience.hpp> --#include <boost/filesystem/operations.hpp> - #include <boost/date_time/posix_time/posix_time.hpp> -+#include <boost/filesystem.hpp> - -@@ -268,3 +267,3 @@ - fs::path binary_file = fs::system_complete(FilenameToPath(argv0)); -- bin_dir = binary_file.branch_path(); -+ bin_dir = binary_file.parent_path(); - } catch (const fs::filesystem_error &) { -@@ -317,3 +316,3 @@ - fs::path binary_file = fs::system_complete(fs::path(path_text)); -- bin_dir = binary_file.branch_path(); -+ bin_dir = binary_file.parent_path(); - ---- a/util/OptionsDB.cpp -+++ b/util/OptionsDB.cpp -@@ -16,4 +16,3 @@ - #include <boost/algorithm/string/predicate.hpp> --#include <boost/filesystem/fstream.hpp> --#include <boost/filesystem/operations.hpp> -+#include <boost/filesystem.hpp> - #include <boost/range/algorithm_ext/erase.hpp> diff --git a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild deleted file mode 100644 index f7d5cad3ef66..000000000000 --- a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit check-reqs cmake flag-o-matic multiprocessing python-single-r1 xdg - -DESCRIPTION="Free turn-based space empire and galactic conquest game" -HOMEPAGE="https://www.freeorion.org/"; -SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz"; -S=${WORKDIR}/src-tarball - -LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+client doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]') - sys-libs/zlib:= - client? ( - media-libs/freetype - media-libs/glew:0= - media-libs/libglvnd - media-libs/libogg - media-libs/libpng:= - media-libs/libsdl2[opengl,video] - media-libs/libvorbis - media-libs/openal - ) -" -RDEPEND=" - ${DEPEND} - client? ( - media-fonts/dejavu - media-fonts/roboto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) -" - -PATCHES=( - "${FILESDIR}"/${P}-boost1.85.patch -) - -freeorion_check-reqs() { - # cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB - # if debug symbols) then far less for the rest, check minimal jobs*1.5 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*1500))M - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - freeorion_check-reqs -} - -pkg_setup() { - freeorion_check-reqs - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -i 's/-O3//' CMakeLists.txt || die - - cmake_comment_add_subdirectory check #904124 -} - -src_configure() { - filter-lto # -Werror=odr issues - - # TODO: drop this after boost-1.85.0-r0 been gone for some time - has_version =dev-libs/boost-1.85.0-r0 && - append-flags -fno-strict-aliasing #932780,933289 - - local mycmakeargs=( - -DCCACHE_PROGRAM=no - -DBUILD_CLIENT_GG=$(usex client) - -DBUILD_CLIENT_GODOT=no # TODO? perhaps with system godot (experimental) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all $(usev doc) -} - -src_test() { - cmake_src_test -j1 # avoid running 2 conflicting servers - - local EPYTEST_DESELECT=( - # broken with 3.11 but is not known to cause issues, just skip for now - tests/AI/save_game_codec/test_savegame_manager.py::test_setstate_call - ) - - epytest -o cache_dir="${T}"/pytest_cache default/python/tests -} - -src_install() { - local DOCS=( ChangeLog.md README.md ) - cmake_src_install - - use doc && dodoc -r "${BUILD_DIR}"/doc/cpp-apidoc/html - - if use client; then - local font - for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do - dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/} - done - rm -- "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die - else - rm -r -- "${ED}"/usr/share/freeorion/default/data/fonts || die - fi -}
