[packages/widelands] upstream fix for gcc >= 13
atler
atler at pld-linux.org
Wed Jul 5 20:40:21 CEST 2023
commit 9970153a82efebc23413c251b93c01210e429149
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Jul 5 20:17:07 2023 +0200
upstream fix for gcc >= 13
from: https://github.com/widelands/widelands/pull/5765
gcc13.patch | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
widelands.spec | 2 +
2 files changed, 157 insertions(+)
---
diff --git a/widelands.spec b/widelands.spec
index 00c3035..3b73268 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -13,6 +13,7 @@ Group: X11/Applications/Games
Source0: https://github.com/widelands/widelands/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 04d84445a479a976c6d82a032b685822
Patch0: %{name}-pld.patch
+Patch1: gcc13.patch
URL: https://wl.widelands.org/
BuildRequires: Mesa-libGL-devel
BuildRequires: SDL2-devel >= 2
@@ -88,6 +89,7 @@ potrzebny do normalnej pracy.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/gcc13.patch b/gcc13.patch
new file mode 100644
index 0000000..6514d67
--- /dev/null
+++ b/gcc13.patch
@@ -0,0 +1,155 @@
+From 5b5553fb90f17ad67fcdebfa05aa4b042834449d Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Wed, 25 Jan 2023 23:42:42 +0100
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <cstdint> is no longer transitively included. Explicitly include
+it for uint*_t.
+---
+ src/base/md5.h | 1 +
+ src/base/random.h | 1 +
+ src/base/time_string.h | 1 +
+ src/build_info.h | 1 +
+ src/graphic/align.h | 1 +
+ src/graphic/text/textstream.h | 1 +
+ src/logic/generic_save_handler.h | 1 +
+ src/logic/map_revision.h | 1 +
+ src/logic/save_handler.h | 1 +
+ src/map_io/map_elemental_packet.h | 1 +
+ src/scripting/persistence.h | 2 ++
+ 11 files changed, 12 insertions(+)
+
+diff --git a/src/base/md5.h b/src/base/md5.h
+index a11966ab81c..29a60b4bf87 100644
+--- a/src/base/md5.h
++++ b/src/base/md5.h
+@@ -21,6 +21,7 @@
+ #define WL_BASE_MD5_H
+
+ #include <cassert>
++#include <cstdint>
+ #include <cstring>
+ #include <string>
+
+diff --git a/src/base/random.h b/src/base/random.h
+index 5030805244a..76774bc3665 100644
+--- a/src/base/random.h
++++ b/src/base/random.h
+@@ -20,6 +20,7 @@
+ #define WL_BASE_RANDOM_H
+
+ #include <cassert>
++#include <cstdint>
+ #include <string>
+
+ extern const uint32_t rng_sbox[256];
+diff --git a/src/base/time_string.h b/src/base/time_string.h
+index 0246b190958..47767732e76 100644
+--- a/src/base/time_string.h
++++ b/src/base/time_string.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_BASE_TIME_STRING_H
+ #define WL_BASE_TIME_STRING_H
+
++#include <cstdint>
+ #include <string>
+
+ /// Get a string representation conforming to ISO 8601 of the current time (in
+diff --git a/src/build_info.h b/src/build_info.h
+index 5afecc13e82..88a382c19ce 100644
+--- a/src/build_info.h
++++ b/src/build_info.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_BUILD_INFO_H
+ #define WL_BUILD_INFO_H
+
++#include <cstdint>
+ #include <string>
+
+ constexpr uint16_t kWidelandsCopyrightStart = 2002;
+diff --git a/src/graphic/align.h b/src/graphic/align.h
+index 205a0bd0d25..f76c5040e35 100644
+--- a/src/graphic/align.h
++++ b/src/graphic/align.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_GRAPHIC_ALIGN_H
+ #define WL_GRAPHIC_ALIGN_H
+
++#include <cstdint>
+ #include <string>
+
+ #include "base/rect.h"
+diff --git a/src/graphic/text/textstream.h b/src/graphic/text/textstream.h
+index b2af46ee8e4..7fe027b8655 100644
+--- a/src/graphic/text/textstream.h
++++ b/src/graphic/text/textstream.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_GRAPHIC_TEXT_TEXTSTREAM_H
+ #define WL_GRAPHIC_TEXT_TEXTSTREAM_H
+
++#include <cstdint>
+ #include <string>
+
+ namespace RT {
+diff --git a/src/logic/generic_save_handler.h b/src/logic/generic_save_handler.h
+index 15147293c4a..97bc7544ef0 100644
+--- a/src/logic/generic_save_handler.h
++++ b/src/logic/generic_save_handler.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_GENERIC_SAVE_HANDLER_H
+ #define WL_LOGIC_GENERIC_SAVE_HANDLER_H
+
++#include <cstdint>
+ #include <functional>
+
+ #include "io/filesystem/filesystem.h"
+diff --git a/src/logic/map_revision.h b/src/logic/map_revision.h
+index b685a8a032e..27b0d5c40fe 100644
+--- a/src/logic/map_revision.h
++++ b/src/logic/map_revision.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MAP_REVISION_H
+ #define WL_LOGIC_MAP_REVISION_H
+
++#include <cstdint>
+ #include <string>
+
+ namespace Widelands {
+diff --git a/src/logic/save_handler.h b/src/logic/save_handler.h
+index 6e6956ae654..e01503b8cba 100644
+--- a/src/logic/save_handler.h
++++ b/src/logic/save_handler.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_SAVE_HANDLER_H
+ #define WL_LOGIC_SAVE_HANDLER_H
+
++#include <cstdint>
+ #include "io/filesystem/filesystem.h"
+
+ namespace Widelands {
+diff --git a/src/map_io/map_elemental_packet.h b/src/map_io/map_elemental_packet.h
+index 4aa1e987e19..a20e649c01d 100644
+--- a/src/map_io/map_elemental_packet.h
++++ b/src/map_io/map_elemental_packet.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_MAP_IO_MAP_ELEMENTAL_PACKET_H
+ #define WL_MAP_IO_MAP_ELEMENTAL_PACKET_H
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+diff --git a/src/scripting/persistence.h b/src/scripting/persistence.h
+index 3ab3f14ec18..dbcaec15c43 100644
+--- a/src/scripting/persistence.h
++++ b/src/scripting/persistence.h
+@@ -19,6 +19,8 @@
+ #ifndef WL_SCRIPTING_PERSISTENCE_H
+ #define WL_SCRIPTING_PERSISTENCE_H
+
++#include <cstdint>
++
+ #include "scripting/lua.h"
+
+ class FileRead;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/a534d47bf280899ef9466d8b3f87a678fdcdbf21
More information about the pld-cvs-commit
mailing list