forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-strategy/s25rttr: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/891713 Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
e5f8dba
commit e4dcbf5
Showing
2 changed files
with
52 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
https://bugs.gentoo.org/891713 | ||
https://github.com/Return-To-The-Roots/s25client/pull/1548 | ||
https://github.com/Return-To-The-Roots/libsiedler2/pull/21 | ||
|
||
From d59abd4b565cd6f11dd64f6e4f497c9797e52c5a Mon Sep 17 00:00:00 2001 | ||
From: Sam James <[email protected]> | ||
Date: Mon, 23 Jan 2023 01:49:47 +0000 | ||
Subject: [PATCH] LanGameInfo: Add missing <cstdint> include | ||
|
||
GCC 13 (as usual for new compiler releases) shuffles around some | ||
internal includes and so <cstdint> etc is no longer transitively included. | ||
|
||
See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. | ||
|
||
Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20 | ||
Bug: https://bugs.gentoo.org/891713 | ||
--- a/libs/s25main/gameTypes/LanGameInfo.h | ||
+++ b/libs/s25main/gameTypes/LanGameInfo.h | ||
@@ -4,6 +4,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
|
||
class Serializer; | ||
|
||
From 6a289fa3a3f50f0967a072292f3e0c628144ab8d Mon Sep 17 00:00:00 2001 | ||
From: Sam James <[email protected]> | ||
Date: Mon, 23 Jan 2023 01:47:19 +0000 | ||
Subject: [PATCH] oem: Add missing <cstdint> include | ||
|
||
GCC 13 (as usual for new compiler releases) shuffles around some | ||
internal includes and so <cstdint> etc is no longer transitively included. | ||
|
||
See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. | ||
|
||
Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20 | ||
Bug: https://bugs.gentoo.org/891713 | ||
--- a/external/libsiedler2/src/oem.cpp | ||
+++ b/external/libsiedler2/src/oem.cpp | ||
@@ -4,6 +4,7 @@ | ||
|
||
#include "oem.h" | ||
#include <array> | ||
+#include <cstdint> | ||
|
||
namespace libsiedler2 { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters