From e170fc6f3e73b3dda51f14f3b300071f357f3f20 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@openmamba.org>
Date: Thu, 4 Apr 2024 18:49:29 +0200
Subject: [PATCH] automatic version update by autodist [release 1.2-1mamba;Thu
 Apr 04 2024]

---
 widelands-1.1-gcc-13.2.0.patch | 124 ---------------------------------
 widelands.spec                 |   7 +-
 2 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 widelands-1.1-gcc-13.2.0.patch

diff --git a/widelands-1.1-gcc-13.2.0.patch b/widelands-1.1-gcc-13.2.0.patch
deleted file mode 100644
index c2f2501..0000000
--- a/widelands-1.1-gcc-13.2.0.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-https://github.com/widelands/widelands/pull/5765
-
-From 14b9c357073126d11d719fd1a539bb7ef0154791 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@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 uint16_t.
---- 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>
- 
---- 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];
---- 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
---- 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;
---- 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"
---- 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 {
---- 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"
---- 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 {
---- a/src/logic/save_handler.h
-+++ b/src/logic/save_handler.h
-@@ -19,6 +19,8 @@
- #ifndef WL_LOGIC_SAVE_HANDLER_H
- #define WL_LOGIC_SAVE_HANDLER_H
- 
-+#include <cstdint>
-+
- #include "io/filesystem/filesystem.h"
- 
- namespace Widelands {
---- 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>
- 
---- 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;
--- 
-2.39.1
diff --git a/widelands.spec b/widelands.spec
index 9f9d235..43b58ff 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -1,6 +1,6 @@
 Name:          widelands
 Epoch:         1
-Version:       1.1
+Version:       1.2
 Release:       1mamba
 Summary:       A game like Settlers II
 Group:         Graphical Desktop/Applications/Games
@@ -9,7 +9,6 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.widelands.org/
 Source:        https://github.com/widelands/widelands.git/v%{version}/widelands-%{version}.tar.bz2
-Patch0:        widelands-1.1-gcc-13.2.0.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -44,7 +43,6 @@ In Widelands, you are the regent of a small tribe. You start out with nothing bu
 %setup -q
 #-D -T
 #:<< _EOF
-%patch 0 -p1 -b .gcc-13.2.0
 
 %build
 #:<< _EOF
@@ -79,6 +77,9 @@ rm -f %{buildroot}%{_prefix}/{COPYING,CREDITS,ChangeLog,VERSION}
 %doc COPYING CREDITS
 
 %changelog
+* Thu Apr 04 2024 Automatic Build System <autodist@openmamba.org> 1.2-1mamba
+- automatic version update by autodist
+
 * Fri Feb 23 2024 Automatic Build System <autodist@mambasoft.it> 1.1-1mamba
 - automatic version update by autodist