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: Thu, 16 Nov 2023 20:38:15 +0000 (UTC)	[thread overview]
Message-ID: <1700167022.1d19803e7db93e18bc890f10079177319dc6b563.conikost@gentoo> (raw)

commit:     1d19803e7db93e18bc890f10079177319dc6b563
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 20:37:02 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 20:37:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d19803e

games-simulation/openrct2: fix compilation with gcc14

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

 .../openrct2/files/openrct2-0.4.6-gcc14.patch      | 30 ++++++++++++++++++++++
 games-simulation/openrct2/openrct2-0.4.6.ebuild    |  1 +
 2 files changed, 31 insertions(+)

diff --git a/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch b/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
new file mode 100644
index 000000000000..2c2c00fff5e7
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
@@ -0,0 +1,30 @@
+From 11c46987aed7f8ef941140a171d55abc8cd8d0d5 Mon Sep 17 00:00:00 2001
+From: Kostadin <kocelfc@tutanota.com>
+Date: Thu, 16 Nov 2023 22:26:05 +0200
+Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 (#20981)
+
+With gcc 14 some C++ Standard Library headers have been changed to no
+longer include other headers that were used internally by the library.
+In OpenRCT2's case it is the <algorithm> header.
+
+Downstream Gentoo bug: https://bugs.gentoo.org/917016
+
+GCC 14 porting guide: https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes
+
+Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
+---
+ src/openrct2/core/FileWatcher.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp
+index 439be15859ed..3ce0309c8cc8 100644
+--- a/src/openrct2/core/FileWatcher.cpp
++++ b/src/openrct2/core/FileWatcher.cpp
+@@ -7,6 +7,7 @@
+  * OpenRCT2 is licensed under the GNU General Public License version 3.
+  *****************************************************************************/
+ 
++#include <algorithm>
+ #include <array>
+ #include <cstdio>
+ #include <stdexcept>

diff --git a/games-simulation/openrct2/openrct2-0.4.6.ebuild b/games-simulation/openrct2/openrct2-0.4.6.ebuild
index 64107568e416..3049ac705a1b 100644
--- a/games-simulation/openrct2/openrct2-0.4.6.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.6.ebuild
@@ -73,6 +73,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.6-gcc14.patch"
 )
 
 src_unpack() {


             reply	other threads:[~2023-11-16 20:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-16 20:38 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
2024-10-11 13:37 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=1700167022.1d19803e7db93e18bc890f10079177319dc6b563.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