From 79fbd982b8ac67b60caf8c5c4d2db96298f94876fd0b630f292a775a0a15e44a Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 5 Apr 2023 08:01:01 +0000 Subject: [PATCH] Accepting request 1075519 from home:iznogood:branches:games - Add widelands-fix-missing-include.patch: Add missing #include OBS-URL: https://build.opensuse.org/request/show/1075519 OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=65 --- widelands-fix-missing-include.patch | 152 ++++++++++++++++++++++++++++ widelands.changes | 7 +- widelands.spec | 4 +- 3 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 widelands-fix-missing-include.patch diff --git a/widelands-fix-missing-include.patch b/widelands-fix-missing-include.patch new file mode 100644 index 0000000..22ff395 --- /dev/null +++ b/widelands-fix-missing-include.patch @@ -0,0 +1,152 @@ +From a05b4e7de1eb125882c8c390ee7ffee0bcaf09ca Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 27 Jan 2023 09:03:25 +0100 +Subject: [PATCH] Fix build with gcc 13 by including `` (#5765) + +--- + 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(+) + +Index: widelands-1.1/src/base/md5.h +=================================================================== +--- widelands-1.1.orig/src/base/md5.h ++++ widelands-1.1/src/base/md5.h +@@ -21,6 +21,7 @@ + #define WL_BASE_MD5_H + + #include ++#include + #include + #include + +Index: widelands-1.1/src/base/random.h +=================================================================== +--- widelands-1.1.orig/src/base/random.h ++++ widelands-1.1/src/base/random.h +@@ -20,6 +20,7 @@ + #define WL_BASE_RANDOM_H + + #include ++#include + #include + + extern const uint32_t rng_sbox[256]; +Index: widelands-1.1/src/base/time_string.h +=================================================================== +--- widelands-1.1.orig/src/base/time_string.h ++++ widelands-1.1/src/base/time_string.h +@@ -19,6 +19,7 @@ + #ifndef WL_BASE_TIME_STRING_H + #define WL_BASE_TIME_STRING_H + ++#include + #include + + /// Get a string representation conforming to ISO 8601 of the current time (in +Index: widelands-1.1/src/build_info.h +=================================================================== +--- widelands-1.1.orig/src/build_info.h ++++ widelands-1.1/src/build_info.h +@@ -19,6 +19,7 @@ + #ifndef WL_BUILD_INFO_H + #define WL_BUILD_INFO_H + ++#include + #include + + constexpr uint16_t kWidelandsCopyrightStart = 2002; +Index: widelands-1.1/src/graphic/align.h +=================================================================== +--- widelands-1.1.orig/src/graphic/align.h ++++ widelands-1.1/src/graphic/align.h +@@ -19,6 +19,7 @@ + #ifndef WL_GRAPHIC_ALIGN_H + #define WL_GRAPHIC_ALIGN_H + ++#include + #include + + #include "base/rect.h" +Index: widelands-1.1/src/graphic/text/textstream.h +=================================================================== +--- widelands-1.1.orig/src/graphic/text/textstream.h ++++ widelands-1.1/src/graphic/text/textstream.h +@@ -19,6 +19,7 @@ + #ifndef WL_GRAPHIC_TEXT_TEXTSTREAM_H + #define WL_GRAPHIC_TEXT_TEXTSTREAM_H + ++#include + #include + + namespace RT { +Index: widelands-1.1/src/logic/generic_save_handler.h +=================================================================== +--- widelands-1.1.orig/src/logic/generic_save_handler.h ++++ widelands-1.1/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 + #include + + #include "io/filesystem/filesystem.h" +Index: widelands-1.1/src/logic/map_revision.h +=================================================================== +--- widelands-1.1.orig/src/logic/map_revision.h ++++ widelands-1.1/src/logic/map_revision.h +@@ -19,6 +19,7 @@ + #ifndef WL_LOGIC_MAP_REVISION_H + #define WL_LOGIC_MAP_REVISION_H + ++#include + #include + + namespace Widelands { +Index: widelands-1.1/src/logic/save_handler.h +=================================================================== +--- widelands-1.1.orig/src/logic/save_handler.h ++++ widelands-1.1/src/logic/save_handler.h +@@ -19,6 +19,7 @@ + #ifndef WL_LOGIC_SAVE_HANDLER_H + #define WL_LOGIC_SAVE_HANDLER_H + ++#include + #include "io/filesystem/filesystem.h" + + namespace Widelands { +Index: widelands-1.1/src/map_io/map_elemental_packet.h +=================================================================== +--- widelands-1.1.orig/src/map_io/map_elemental_packet.h ++++ widelands-1.1/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 + #include + #include + +Index: widelands-1.1/src/scripting/persistence.h +=================================================================== +--- widelands-1.1.orig/src/scripting/persistence.h ++++ widelands-1.1/src/scripting/persistence.h +@@ -19,6 +19,8 @@ + #ifndef WL_SCRIPTING_PERSISTENCE_H + #define WL_SCRIPTING_PERSISTENCE_H + ++#include ++ + #include "scripting/lua.h" + + class FileRead; diff --git a/widelands.changes b/widelands.changes index 2eae247..e5f81b1 100644 --- a/widelands.changes +++ b/widelands.changes @@ -1,9 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 30 07:38:29 UTC 2023 - Bjørn Lie + +- Add widelands-fix-missing-include.patch: Add missing #include + ------------------------------------------------------------------- Mon Feb 27 19:08:17 UTC 2023 - Carsten Ziepke - Use BuildRequires asio-devel instead pkgconfig(asio), enables build for openSUSE Leap 15.4 - + ------------------------------------------------------------------- Sun Dec 18 15:12:59 UTC 2022 - Dirk Müller diff --git a/widelands.spec b/widelands.spec index 8f812ef..2554d84 100644 --- a/widelands.spec +++ b/widelands.spec @@ -23,11 +23,13 @@ Summary: Realtime strategy game involving map control License: GPL-2.0-or-later URL: https://www.widelands.org Source0: https://github.com/%{name}/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: asio-devel +# PATCH-FIX-UPSTREAM widelands-fix-missing-include.patch -- Add missing #include +Patch0: widelands-fix-missing-include.patch BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel BuildRequires: SDL2_ttf-devel +BuildRequires: asio-devel BuildRequires: cmake BuildRequires: curl-devel BuildRequires: distribution-release