commit: ab6e0062c94e108d8b9f8840d0cf786453688d5f Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Thu Feb 27 13:17:08 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Thu Feb 27 13:34:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6e0062
games-simulation/simutrans: drop 124.1 Closes: https://bugs.gentoo.org/935134 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> games-simulation/simutrans/Manifest | 3 - .../files/simutrans-124.1-fix-miniupnpc-api.patch | 42 -------- games-simulation/simutrans/simutrans-124.1.ebuild | 114 --------------------- 3 files changed, 159 deletions(-) diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest index 6b11d1e4bbdc..b63c62ce5b5d 100644 --- a/games-simulation/simutrans/Manifest +++ b/games-simulation/simutrans/Manifest @@ -1,6 +1,3 @@ -DIST simutrans-src-124-1.zip 5965405 BLAKE2B 15e9365df40d9e26f50b63d2e2e2d6f4e03bc5111a28ca3fbe454cfd7339ebbbf3fb99f8f060604f7ca6861fb4220aa9aa0bcd275d98abea6825cbb08956e814 SHA512 f2c95e67ed90a44044264d81dbd1b8db7999a3f192bbfb09f775404924b7583bbf12e1a5841c1e8968ed9bba1bdaff0ca4c913aee83eba5b247c8860a3801c0e DIST simutrans-src-124-2-1.zip 5463858 BLAKE2B 034dabd8a74a9dc9d57f72d92179a27c97a718a27470938d4054283d45e0d6b3a9bb34e31ec3b2574e90e1f9d1ebf27a2343ee760818ebc8b109f758fc45a131 SHA512 e8cd229a08e52542f0760227889f0db30017f43ddf44789770a6d6fe9e76d6b82288d2174381e4ab22391cacad97201dc10bc83d1e51a8947b82c5a013450d35 -DIST simutrans_language_pack-Base+texts-124.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939 DIST simutrans_language_pack-Base+texts-124.2.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939 -DIST simutrans_simupak64-124-1.zip 5095713 BLAKE2B fdb31043917bd9736cacc6f17a06e0b440a79e077491333491d700bb45b0ec4097d8a13ef34b1a94001cb06c4732250e856b59f7b7faf1537c94860367e16a20 SHA512 fb434104aaf485f78becd99e075fa11d58e59b5e2ee5dfc592b21aec6906f01951bce20181fcb1dacb44ea1d390b4241f1935b4b978474292409c6cf1b6bc849 DIST simutrans_simupak64-124-2.zip 5092179 BLAKE2B d953368405ff560eafc25eaa5412a72f3ad7b2344ee9e3ada09922d0291768fb710c4ec9a4ebc0823ac84a4226178c81befaf11c958d771bb15f6f7c7c344f6d SHA512 f2edd7ca15966d7c0284637c3f90d335fd34202d8120e92297de4cc451a6c9c543532e3d5ea38181f59e70db4a6d0bae4da0c240556391e3d5872e782e6bb73d diff --git a/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch b/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch deleted file mode 100644 index 4ea1a7c51298..000000000000 --- a/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch +++ /dev/null @@ -1,42 +0,0 @@ -# adapted from <https://github.com/simutrans/simutrans/commit/089b83b> - -From 089b83b03acfb2c1db9f2d22cc10e94ff8ed63be Mon Sep 17 00:00:00 2001 -From: prissi <prissi@8aca7d54-2c30-db11-9de9-000461428c89> -Date: Mon, 3 Jun 2024 03:31:47 +0000 -Subject: [PATCH] Back to nightly and fix the API for miniupnpc - -git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11273 8aca7d54-2c30-db11-9de9-000461428c89 ---- - -diff --git a/src/simutrans/network/network.cc b/src/simutrans/network/network.cc -index 5acf10e5c..52669ad9d 100644 ---- a/src/simutrans/network/network.cc -+++ b/src/simutrans/network/network.cc -@@ -981,7 +981,12 @@ bool prepare_for_server( char *externalIPAddress, char *externalAltIPAddress, in - struct UPNPUrls urls; - struct IGDdatas data; - -+#if MINIUPNPC_API_VERSION <= 17 - UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) ); -+#else -+ char wanaddr[64] = "uset"; -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr)); -+#endif - // we must know our IP address first - if( UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) == UPNPCOMMAND_SUCCESS ) { - // this is our ID (at least the routes tells us this) -@@ -1040,7 +1045,13 @@ void remove_port_forwarding( int port ) - struct UPNPUrls urls; - struct IGDdatas data; - -- UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) ); -+#if MINIUPNPC_API_VERSION <= 17 -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); -+#else -+ char wanaddr[64] = "uset"; -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr)); -+#endif -+ - // we must know our IP address first - if( UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) == UPNPCOMMAND_SUCCESS ) { - // this is our ID (at least the routes tells us this) diff --git a/games-simulation/simutrans/simutrans-124.1.ebuild b/games-simulation/simutrans/simutrans-124.1.ebuild deleted file mode 100644 index 60803bf4b9a5..000000000000 --- a/games-simulation/simutrans/simutrans-124.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop flag-o-matic toolchain-funcs xdg - -MY_PV=${PV//./-} -MY_PAK_64="simupak64-${MY_PV}.zip" -# Required for network games, published in release announcement on the forums -MY_SVN_REVISION="11164" - -DESCRIPTION="A free Transport Tycoon clone" -HOMEPAGE="https://www.simutrans.com/"; -SRC_URI=" - https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip - !minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} ) - https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip -" -S="${WORKDIR}" - -# NOTE: get the latest language pack from: -# https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="minimal +midi fontconfig upnp zstd" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - media-libs/libpng:0= - media-libs/libsdl2[sound,video] - sys-libs/zlib - midi? ( media-sound/fluidsynth:=[sdl] ) - fontconfig? ( media-libs/fontconfig ) - upnp? ( net-libs/miniupnpc:= ) - zstd? ( app-arch/zstd ) -" -# miniupnpc restriction: bug #935134 -RDEPEND=" - ${DEPEND} - midi? ( media-sound/fluid-soundfont ) - !<games-simulation/simutrans-paksets-${PV} -" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" -RESTRICT="test" # Opens the program and doesn't close it. - -PATCHES=( - "${FILESDIR}"/${PN}-124.0-disable-svn-check.patch - "${FILESDIR}"/${P}-fix-miniupnpc-api.patch -) - -src_unpack() { - unpack "simutrans-src-${MY_PV}.zip" - cd simutrans || die "could not cd to ‘simutrans’" - use minimal || unpack "simutrans_${MY_PAK_64}" - - # Bundled text files are incomplete, bug #580948 - cd text || die "could not cd to ‘simutrans/text’" - unpack "simutrans_language_pack-Base+texts-${PV}.zip" -} - -src_prepare() { - default - xdg_environment_reset - - strip-flags # bug #293927 - append-flags -fno-strict-aliasing # bug #859229 - - eautoreconf -} - -src_configure() { - default - - # NOTE: some flags need to be 0, some need to be empty to turn them off - cat > config.default <<-EOF || die - BACKEND=sdl2 - OSTYPE=linux - OPTIMISE=0 - STATIC=0 - WITH_REVISION=${MY_SVN_REVISION} - MULTI_THREAD=1 - USE_UPNP=$(usex upnp 1 '') - USE_FREETYPE=1 - USE_ZSTD=$(usex zstd 1 '') - USE_FONTCONFIG=$(usex fontconfig 1 '') - USE_FLUIDSYNTH_MIDI=$(usex midi 1 '') - VERBOSE=1 - - HOSTCC = $(tc-getCC) - HOSTCXX = $(tc-getCXX) - EOF -} - -src_install() { - newbin build/default/sim ${PN} - insinto usr/share/${PN} - doins -r simutrans/* - doicon src/simutrans/${PN}.svg - domenu src/linux/simutrans.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Since 124.0 simutrans allows you to download PakSets to your home directory," - elog "therefore games-simulation/simutrans-paksets has been deprecated." -}
