public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
Date: Fri, 11 Oct 2024 13:37:50 +0000 (UTC)	[thread overview]
Message-ID: <1728653695.892f2d911bd2385d68e84d1dd8e5e642dfd94211.conikost@gentoo> (raw)

commit:     892f2d911bd2385d68e84d1dd8e5e642dfd94211
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 13:34:55 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:34:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892f2d91

games-simulation/openrct2: add correct path patch

Closes: https://bugs.gentoo.org/941262
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../openrct2-0.4.15-include-additional-paths.patch      | 17 +++++++++++++++++
 games-simulation/openrct2/openrct2-0.4.15.ebuild        |  2 +-
 games-simulation/openrct2/openrct2-9999.ebuild          |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
new file mode 100644
index 000000000000..16d306260e67
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
@@ -0,0 +1,17 @@
+--- a/src/openrct2/platform/Platform.Linux.cpp
++++ b/src/openrct2/platform/Platform.Linux.cpp
+@@ -335,12 +335,12 @@
+ 
+     std::vector<std::string_view> GetSearchablePathsRCT1()
+     {
+-        return {};
++        return { "/usr/share/openrct2/rct1_data" };
+     }
+ 
+     std::vector<std::string_view> GetSearchablePathsRCT2()
+     {
+-        return {};
++        return { "/usr/share/openrct2/rct2_data" };
+     }
+ 
+ #    ifndef NO_TTF

diff --git a/games-simulation/openrct2/openrct2-0.4.15.ebuild b/games-simulation/openrct2/openrct2-0.4.15.ebuild
index 2ce516a11c9a..efb5b081135e 100644
--- a/games-simulation/openrct2/openrct2-0.4.15.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.15.ebuild
@@ -77,8 +77,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.15-include-additional-paths.patch"
 )
 
 src_unpack() {

diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 72f2a309f584..cc9b7bfd01b4 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -78,8 +78,8 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.5-include-additional-paths.patch"
 )
 
 src_unpack() {


             reply	other threads:[~2024-10-11 13:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-11 13:37 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-05 21:43 [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/ Conrad Kostecki
2024-11-23 23:36 Conrad Kostecki
2024-11-09  1:41 Conrad Kostecki
2023-11-16 20:38 Conrad Kostecki
2022-07-09 21:30 Conrad Kostecki
2022-04-27 20:08 Conrad Kostecki
2019-12-02 21:16 Conrad Kostecki

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=1728653695.892f2d911bd2385d68e84d1dd8e5e642dfd94211.conikost@gentoo \
    --to=conikost@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