public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/
Date: Fri, 26 Jul 2024 07:40:35 +0000 (UTC)	[thread overview]
Message-ID: <1721979631.84c4b307d7073adfeb1de635e0d6e09819befe92.juippis@gentoo> (raw)

commit:     84c4b307d7073adfeb1de635e0d6e09819befe92
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sat Jun 29 11:43:18 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 07:40:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c4b307

games-simulation/simutrans: fix net-libs/miniupnpc dependency

miniupnpc changed API in 2.2.8, simutrans doesn't build with it
  - patch 124.0
  - restrict miniupnpc version in 123.0.1-r2

Bug: https://bugs.gentoo.org/935134
Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/37357
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-simulation/simutrans/simutrans-123.0.1-r2.ebuild | 2 +-
 games-simulation/simutrans/simutrans-124.0.ebuild      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild b/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
index 094782d07975..4c3b32b2f157 100644
--- a/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
+++ b/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	sys-libs/zlib
 	midi? ( media-sound/fluidsynth:=[sdl] )
 	truetype? ( media-libs/freetype )
-	upnp? ( net-libs/miniupnpc:= )
+	upnp? ( <net-libs/miniupnpc-2.2.8:= )
 	zstd? ( app-arch/zstd )
 "
 RDEPEND="

diff --git a/games-simulation/simutrans/simutrans-124.0.ebuild b/games-simulation/simutrans/simutrans-124.0.ebuild
index 87559c0abb1b..897eb3f3b8d1 100644
--- a/games-simulation/simutrans/simutrans-124.0.ebuild
+++ b/games-simulation/simutrans/simutrans-124.0.ebuild
@@ -49,7 +49,10 @@ BDEPEND="
 "
 RESTRICT="test" # Opens the program and doesn't close it.
 
-PATCHES=( "${FILESDIR}"/${PN}-124.0-disable-svn-check.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-124.0-disable-svn-check.patch
+	"${FILESDIR}"/${PN}-124.1-fix-miniupnpc-api.patch
+)
 
 src_unpack() {
 	unpack "simutrans-src-${MY_PV}.zip"


             reply	other threads:[~2024-07-26  7:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-26  7:40 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-20  6:49 [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/ Joonas Niilola
2024-08-20  6:49 Joonas Niilola
2024-06-08  7:10 Joonas Niilola
2024-06-08  7:10 Joonas Niilola
2023-10-11 11:03 Viorel Munteanu
2022-08-28  8:22 Joonas Niilola
2022-06-21  7:02 Florian Schmaus
2022-06-21  7:02 Florian Schmaus
2022-02-24 13:04 Joonas Niilola
2022-02-24 11:34 Joonas Niilola
2021-11-26  3:40 Sam James
2017-07-05  8:14 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1721979631.84c4b307d7073adfeb1de635e0d6e09819befe92.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox