The package rpms/widelands.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/widelands.git/commit/?id=d29b3727...
https://src.fedoraproject.org/cgit/rpms/widelands.git/commit/?id=9594c69e....
Change:
+%ifarch s390x
+%ifarch s390x
Thanks.
Full change:
============
commit d29b372779b9152c549d9889c514ae405dcf1099
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 28 12:34:37 2023 +0200
New upstream release 1.1 (rhbz#2135131)
Fix FTBFS (rhbz#2171759)
diff --git a/widelands.spec b/widelands.spec
index 3180ca2..94c1472 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -10,7 +10,6 @@ License: GPLv2+
URL:
http://www.widelands.org
Source0:
https://github.com/widelands/widelands/archive/v%{version}/%{name}-%{vers...
# gnu++11 fix in CMakeLists.txt for PPC64 little-endian
-# + remove -Werror=uninitialized to fix build with gcc12
Patch0: widelands-build19-ppc64le.patch
# Fix failures on s390x due to uninitialized variables
Patch1: widelands-build20-gcc10.patch
@@ -22,9 +21,7 @@ Patch1: widelands-build20-gcc10.patch
Patch2: widelands-1.0-make-sdl2-use-x11.patch
Patch3: widelands-1.1-gcc13.patch
Patch4: widelands-1.1-f37-sys-minizip-buildfix.patch
-%ifarch s390x
Patch5: widelands-1.1-disable-some-tests.patch
-%endif
BuildRequires: asio-devel
BuildRequires: SDL2-devel
@@ -57,7 +54,15 @@ perhaps will have a thought, what Widelands is all about.
%prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%ifarch s390x
+%patch5 -p1
+%endif
%build
commit 9594c69e2a76d4289a33b61ea155e4839a71cc32
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 28 12:08:13 2023 +0200
New upstream release 1.1 (rhbz#2135131)
Fix FTBFS (rhbz#2171759)
diff --git a/widelands-1.1-disable-some-tests.patch
b/widelands-1.1-disable-some-tests.patch
new file mode 100644
index 0000000..126bb02
--- /dev/null
+++ b/widelands-1.1-disable-some-tests.patch
@@ -0,0 +1,20 @@
+For some reasons some of the tests are failing on s390x.
+This likely is an endianness issue in the tests themselves.
+
+I strongly doubt anyone is actually playing widelands on s390x,
+so this just disables the failing tests.
+diff -up widelands-1.1/src/base/test/CMakeLists.txt~
widelands-1.1/src/base/test/CMakeLists.txt
+--- widelands-1.1/src/base/test/CMakeLists.txt~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/base/test/CMakeLists.txt 2023-03-28 11:58:34.622478286 +0200
+@@ -3,11 +3,9 @@ wl_test(test_base
+ base_test_main.cc
+ test_geometry.cc
+ test_math.cc
+- test_md5.cc
+ test_times.cc
+ test_time_string.cc
+ test_utf8.cc
+- test_string.cc
+ DEPENDS
+ base
+ base_geometry
diff --git a/widelands.spec b/widelands.spec
index 095f4da..3180ca2 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -22,6 +22,9 @@ Patch1: widelands-build20-gcc10.patch
Patch2: widelands-1.0-make-sdl2-use-x11.patch
Patch3: widelands-1.1-gcc13.patch
Patch4: widelands-1.1-f37-sys-minizip-buildfix.patch
+%ifarch s390x
+Patch5: widelands-1.1-disable-some-tests.patch
+%endif
BuildRequires: asio-devel
BuildRequires: SDL2-devel
commit 01a266aea21806e4a198ef19f102c8124c2930ee
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 28 11:19:32 2023 +0200
New upstream release 1.1 (rhbz#2135131)
Fix FTBFS (rhbz#2171759)
diff --git a/.gitignore b/.gitignore
index 2551fae..7b353a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ Widelands-Build14-src.7z
/widelands-build21.tar.gz
/widelands-1.0.tar.gz
/widelands-1.0.tar.gz.asc
+/widelands-1.1.tar.gz
diff --git a/gpgkey-B79C81844E3EFFC3726CD477D53DCA9A6A3B14A4.gpg
b/gpgkey-B79C81844E3EFFC3726CD477D53DCA9A6A3B14A4.gpg
deleted file mode 100644
index eef2ed0..0000000
Binary files a/gpgkey-B79C81844E3EFFC3726CD477D53DCA9A6A3B14A4.gpg and /dev/null differ
diff --git a/sources b/sources
index 2d3b479..97a184f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (widelands-1.0.tar.gz) =
1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
-SHA512 (widelands-1.0.tar.gz.asc) =
ea4f9b5c57c1fb05d451e36b8a774f0fa87f1e65312186b79a9d9fdbec52202edafffc19cfd7c3e8c28105c9657655cab51bee814cfc466003ca2f05d2d47d39
+SHA512 (widelands-1.1.tar.gz) =
29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
diff --git a/widelands-1.0-gcc12.1.patch b/widelands-1.0-gcc12.1.patch
deleted file mode 100644
index 9bb34be..0000000
--- a/widelands-1.0-gcc12.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up widelands-1.0/src/network/bufferedconnection.h~
widelands-1.0/src/network/bufferedconnection.h
---- widelands-1.0/src/network/bufferedconnection.h~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/src/network/bufferedconnection.h 2022-08-14 22:23:40.946949729 +0200
-@@ -23,6 +23,7 @@
- #include <memory>
- #include <mutex>
- #include <thread>
-+#include <map>
-
- #include "network/network.h"
- #include "network/relay_protocol.h"
diff --git a/widelands-1.0-make-sdl2-use-x11.patch
b/widelands-1.0-make-sdl2-use-x11.patch
index 37a0cf1..0c4deb2 100644
--- a/widelands-1.0-make-sdl2-use-x11.patch
+++ b/widelands-1.0-make-sdl2-use-x11.patch
@@ -1,7 +1,7 @@
-diff -up widelands-1.0/src/graphic/text/test/render_richtext.cc~
widelands-1.0/src/graphic/text/test/render_richtext.cc
---- widelands-1.0/src/graphic/text/test/render_richtext.cc~ 2021-06-14 11:22:20.000000000
+0200
-+++ widelands-1.0/src/graphic/text/test/render_richtext.cc 2022-03-06 15:37:49.207677348
+0100
-@@ -115,6 +115,9 @@ int main(int argc, char** argv) {
+diff -up widelands-1.1/src/graphic/text/test/render_richtext.cc.orig
widelands-1.1/src/graphic/text/test/render_richtext.cc
+--- widelands-1.1/src/graphic/text/test/render_richtext.cc.orig 2022-10-22
13:51:16.000000000 +0200
++++ widelands-1.1/src/graphic/text/test/render_richtext.cc 2023-03-27 21:11:06.712405327
+0200
+@@ -114,6 +114,9 @@ int main(int argc, char** argv) {
if (parse_arguments(argc, argv, &w, outname, inname, allowed_tags))
return 0;
@@ -11,10 +11,10 @@ diff -up widelands-1.0/src/graphic/text/test/render_richtext.cc~
widelands-1.0/s
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
std::cerr << "SDLInit did not succeed: " << SDL_GetError()
<< std::endl;
return 1;
-diff -up widelands-1.0/src/website/website_common.cc~
widelands-1.0/src/website/website_common.cc
---- widelands-1.0/src/website/website_common.cc~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/src/website/website_common.cc 2022-03-06 15:37:57.151598065 +0100
-@@ -19,6 +19,7 @@
+diff -up widelands-1.1/src/website/website_common.cc.orig
widelands-1.1/src/website/website_common.cc
+--- widelands-1.1/src/website/website_common.cc.orig 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/website/website_common.cc 2023-03-27 21:11:06.712405327 +0200
+@@ -18,6 +18,7 @@
#include "website/website_common.h"
@@ -22,8 +22,8 @@ diff -up widelands-1.0/src/website/website_common.cc~
widelands-1.0/src/website/
#include <SDL.h>
#include "base/i18n.h"
-@@ -32,6 +33,9 @@
- void initialize() {
+@@ -33,6 +34,9 @@ void initialize() {
+ set_initializer_thread();
i18n::set_locale("en");
+ // GLEW only supports glx atm, force use of X11 even under Wayland
@@ -32,10 +32,10 @@ diff -up widelands-1.0/src/website/website_common.cc~
widelands-1.0/src/website/
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
// We sometimes run into a missing video driver in our CI environment, so we exit 0 to
prevent
// too frequent failures
-diff -up widelands-1.0/src/wlapplication.cc~ widelands-1.0/src/wlapplication.cc
---- widelands-1.0/src/wlapplication.cc~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/src/wlapplication.cc 2022-03-06 15:37:00.952158832 +0100
-@@ -370,6 +370,9 @@ WLApplication::WLApplication(int const a
+diff -up widelands-1.1/src/wlapplication.cc.orig widelands-1.1/src/wlapplication.cc
+--- widelands-1.1/src/wlapplication.cc.orig 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/wlapplication.cc 2023-03-27 21:11:06.713405319 +0200
+@@ -404,6 +404,9 @@ WLApplication::WLApplication(int const a
#endif
// Start the SDL core
diff --git a/widelands-1.1-f37-sys-minizip-buildfix.patch
b/widelands-1.1-f37-sys-minizip-buildfix.patch
new file mode 100644
index 0000000..8873993
--- /dev/null
+++ b/widelands-1.1-f37-sys-minizip-buildfix.patch
@@ -0,0 +1,14 @@
+diff -up widelands-1.1/cmake/WlFunctions.cmake~ widelands-1.1/cmake/WlFunctions.cmake
+--- widelands-1.1/cmake/WlFunctions.cmake~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/cmake/WlFunctions.cmake 2023-03-28 10:31:21.413196378 +0200
+@@ -77,7 +77,9 @@ macro(_common_compile_tasks)
+ wl_include_directories(${NAME} ${CMAKE_SOURCE_DIR}/src)
+ wl_include_directories(${NAME} ${CMAKE_BINARY_DIR}/src)
+ if(MINIZIP_STATIC_LIBRARIES)
+- wl_include_directories(${NAME} ${MINIZIP_INCLUDE_DIRS})
++ if (MINIZIP_INCLUDE_DIRS)
++ wl_include_directories(${NAME} ${MINIZIP_INCLUDE_DIRS})
++ endif()
+ target_compile_options(${NAME} PUBLIC ${MINIZIP_CFLAGS})
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ include(CheckCXXCompilerFlag)
diff --git a/widelands-1.1-gcc13.patch b/widelands-1.1-gcc13.patch
new file mode 100644
index 0000000..b948e62
--- /dev/null
+++ b/widelands-1.1-gcc13.patch
@@ -0,0 +1,314 @@
+diff -up widelands-1.1/src/base/md5.h~ widelands-1.1/src/base/md5.h
+--- widelands-1.1/src/base/md5.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/base/md5.h 2023-03-27 21:28:34.494634126 +0200
+@@ -22,6 +22,7 @@
+
+ #include <cassert>
+ #include <cstring>
++#include <cstdint>
+ #include <string>
+
+ /* Structure to save state of computation between the single steps. */
+diff -up widelands-1.1/src/build_info.h~ widelands-1.1/src/build_info.h
+--- widelands-1.1/src/build_info.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/build_info.h 2023-03-27 21:24:21.545738695 +0200
+@@ -20,6 +20,7 @@
+ #define WL_BUILD_INFO_H
+
+ #include <string>
++#include <cstdint>
+
+ constexpr uint16_t kWidelandsCopyrightStart = 2002;
+ // If the following line is changed, the corresponding regex in
'utils/update_copyright.py' will
+diff -up widelands-1.1/src/graphic/align.h~ widelands-1.1/src/graphic/align.h
+--- widelands-1.1/src/graphic/align.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/graphic/align.h 2023-03-27 21:37:50.732994947 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_GRAPHIC_ALIGN_H
+ #define WL_GRAPHIC_ALIGN_H
+
++#include <cstdint>
+ #include <string>
+
+ #include "base/rect.h"
+diff -up widelands-1.1/src/base/random.h~ widelands-1.1/src/base/random.h
+--- widelands-1.1/src/base/random.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/base/random.h 2023-03-27 21:40:08.219843589 +0200
+@@ -20,6 +20,7 @@
+ #define WL_BASE_RANDOM_H
+
+ #include <cassert>
++#include <cstdint>
+ #include <string>
+
+ extern const uint32_t rng_sbox[256];
+diff -up widelands-1.1/src/io/filesystem/zip_filesystem.h~
widelands-1.1/src/io/filesystem/zip_filesystem.h
+--- widelands-1.1/src/io/filesystem/zip_filesystem.h~ 2022-10-22 13:51:16.000000000
+0200
++++ widelands-1.1/src/io/filesystem/zip_filesystem.h 2023-03-27 21:46:36.709590151 +0200
+@@ -23,6 +23,7 @@
+
+ #include <unzip.h>
+ #include <zip.h>
++#include <zlib.h>
+
+ #include "io/filesystem/filesystem.h"
+ #include "io/streamread.h"
+diff -up widelands-1.1/src/base/time_string.h~ widelands-1.1/src/base/time_string.h
+--- widelands-1.1/src/base/time_string.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/base/time_string.h 2023-03-27 22:28:19.024604798 +0200
+@@ -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 -up widelands-1.1/src/logic/generic_save_handler.h~
widelands-1.1/src/logic/generic_save_handler.h
+--- widelands-1.1/src/logic/generic_save_handler.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/generic_save_handler.h 2023-03-27 22:32:49.724403544 +0200
+@@ -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 -up widelands-1.1/src/scripting/persistence.h~
widelands-1.1/src/scripting/persistence.h
+--- widelands-1.1/src/scripting/persistence.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/scripting/persistence.h 2023-03-27 22:39:15.022270365 +0200
+@@ -19,6 +19,8 @@
+ #ifndef WL_SCRIPTING_PERSISTENCE_H
+ #define WL_SCRIPTING_PERSISTENCE_H
+
++#include <cstdint>
++
+ #include "scripting/lua.h"
+
+ class FileRead;
+diff -up widelands-1.1/src/map_io/map_elemental_packet.h~
widelands-1.1/src/map_io/map_elemental_packet.h
+--- widelands-1.1/src/map_io/map_elemental_packet.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/map_io/map_elemental_packet.h 2023-03-27 22:44:03.699928430 +0200
+@@ -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 -up widelands-1.1/src/logic/save_handler.h~ widelands-1.1/src/logic/save_handler.h
+--- widelands-1.1/src/logic/save_handler.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/save_handler.h 2023-03-27 22:53:07.898560634 +0200
+@@ -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 {
+diff -up widelands-1.1/src/logic/map_revision.h~ widelands-1.1/src/logic/map_revision.h
+--- widelands-1.1/src/logic/map_revision.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/map_revision.h 2023-03-27 22:57:27.966473320 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MAP_REVISION_H
+ #define WL_LOGIC_MAP_REVISION_H
+
++#include <cstdint>
+ #include <string>
+
+ namespace Widelands {
+diff -up widelands-1.1/src/logic/addons.h~ widelands-1.1/src/logic/addons.h
+--- widelands-1.1/src/logic/addons.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/addons.h 2023-03-27 22:58:16.316085244 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_ADDONS_H
+ #define WL_LOGIC_ADDONS_H
+
++#include <cstdint>
+ #include <ctime>
+ #include <functional>
+ #include <map>
+diff -up widelands-1.1/src/logic/ai_dna_handler.h~
widelands-1.1/src/logic/ai_dna_handler.h
+--- widelands-1.1/src/logic/ai_dna_handler.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/ai_dna_handler.h 2023-03-27 22:58:21.068047105 +0200
+@@ -19,6 +19,8 @@
+ #ifndef WL_LOGIC_AI_DNA_HANDLER_H
+ #define WL_LOGIC_AI_DNA_HANDLER_H
+
++#include <cstdint>
++
+ #include "logic/player.h"
+
+ namespace Widelands {
+diff -up widelands-1.1/src/logic/cmd_queue.h~ widelands-1.1/src/logic/cmd_queue.h
+--- widelands-1.1/src/logic/cmd_queue.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/cmd_queue.h 2023-03-27 22:58:25.692009993 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_CMD_QUEUE_H
+ #define WL_LOGIC_CMD_QUEUE_H
+
++#include <cstdint>
+ #include <queue>
+
+ #include "base/times.h"
+diff -up widelands-1.1/src/logic/game.h~ widelands-1.1/src/logic/game.h
+--- widelands-1.1/src/logic/game.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/game.h 2023-03-27 22:58:30.387972304 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_GAME_H
+ #define WL_LOGIC_GAME_H
+
++#include <cstdint>
+ #include <memory>
+
+ #include "base/md5.h"
+diff -up widelands-1.1/src/logic/game_controller.h~
widelands-1.1/src/logic/game_controller.h
+--- widelands-1.1/src/logic/game_controller.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/game_controller.h 2023-03-27 22:58:37.804912776 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_GAME_CONTROLLER_H
+ #define WL_LOGIC_GAME_CONTROLLER_H
+
++#include <cstdint>
+ #include <string>
+
+ #include "base/times.h"
+diff -up widelands-1.1/src/logic/game_settings.h~
widelands-1.1/src/logic/game_settings.h
+--- widelands-1.1/src/logic/game_settings.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/game_settings.h 2023-03-27 22:58:42.244877140 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_GAME_SETTINGS_H
+ #define WL_LOGIC_GAME_SETTINGS_H
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+
+diff -up widelands-1.1/src/logic/map.h~ widelands-1.1/src/logic/map.h
+--- widelands-1.1/src/logic/map.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/map.h 2023-03-27 22:58:50.229813053 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MAP_H
+ #define WL_LOGIC_MAP_H
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+diff -up widelands-1.1/src/logic/mapastar.h~ widelands-1.1/src/logic/mapastar.h
+--- widelands-1.1/src/logic/mapastar.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/mapastar.h 2023-03-27 22:58:56.220764976 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MAPASTAR_H
+ #define WL_LOGIC_MAPASTAR_H
+
++#include <cstdint>
+ #include <memory>
+
+ #include "logic/map.h"
+diff -up widelands-1.1/src/logic/maphollowregion.h~
widelands-1.1/src/logic/maphollowregion.h
+--- widelands-1.1/src/logic/maphollowregion.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/maphollowregion.h 2023-03-27 22:59:00.125733634 +0200
+@@ -19,6 +19,8 @@
+ #ifndef WL_LOGIC_MAPHOLLOWREGION_H
+ #define WL_LOGIC_MAPHOLLOWREGION_H
+
++#include <cstdint>
++
+ #include "logic/map.h"
+
+ namespace Widelands {
+diff -up widelands-1.1/src/logic/message_queue.h~
widelands-1.1/src/logic/message_queue.h
+--- widelands-1.1/src/logic/message_queue.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/message_queue.h 2023-03-27 22:59:06.236684594 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MESSAGE_QUEUE_H
+ #define WL_LOGIC_MESSAGE_QUEUE_H
+
++#include <cstdint>
+ #include <cassert>
+ #include <memory>
+
+diff -up widelands-1.1/src/logic/pathfield.h~ widelands-1.1/src/logic/pathfield.h
+--- widelands-1.1/src/logic/pathfield.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/pathfield.h 2023-03-27 22:59:09.948654805 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_PATHFIELD_H
+ #define WL_LOGIC_PATHFIELD_H
+
++#include <cstdint>
+ #include <memory>
+
+ #include "logic/cookie_priority_queue.h"
+diff -up widelands-1.1/src/logic/player.h~ widelands-1.1/src/logic/player.h
+--- widelands-1.1/src/logic/player.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/player.h 2023-03-27 22:59:14.012622187 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_PLAYER_H
+ #define WL_LOGIC_PLAYER_H
+
++#include <cstdint>
+ #include <atomic>
+ #include <memory>
+
+diff -up widelands-1.1/src/logic/playercommand.h~
widelands-1.1/src/logic/playercommand.h
+--- widelands-1.1/src/logic/playercommand.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/playercommand.h 2023-03-27 22:59:17.612593293 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_PLAYERCOMMAND_H
+ #define WL_LOGIC_PLAYERCOMMAND_H
+
++#include <cstdint>
+ #include <memory>
+
+ #include "economy/flag.h"
+diff -up widelands-1.1/src/logic/replay_game_controller.h~
widelands-1.1/src/logic/replay_game_controller.h
+--- widelands-1.1/src/logic/replay_game_controller.h~ 2022-10-22 13:51:16.000000000
+0200
++++ widelands-1.1/src/logic/replay_game_controller.h 2023-03-27 22:59:21.420562726 +0200
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_REPLAY_GAME_CONTROLLER_H
+ #define WL_LOGIC_REPLAY_GAME_CONTROLLER_H
+
++#include <cstdint>
+ #include <memory>
+
+ #include "logic/cmd_queue.h"
+diff -up widelands-1.1/src/logic/single_player_game_controller.h~
widelands-1.1/src/logic/single_player_game_controller.h
+--- widelands-1.1/src/logic/single_player_game_controller.h~ 2022-10-22
13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/single_player_game_controller.h 2023-03-27 22:59:27.132516891
+0200
+@@ -19,6 +19,8 @@
+ #ifndef WL_LOGIC_SINGLE_PLAYER_GAME_CONTROLLER_H
+ #define WL_LOGIC_SINGLE_PLAYER_GAME_CONTROLLER_H
+
++#include <cstdint>
++
+ #include "ai/computer_player.h"
+ #include "logic/game_controller.h"
+
+diff -up widelands-1.1/src/logic/single_player_game_settings_provider.h~
widelands-1.1/src/logic/single_player_game_settings_provider.h
+--- widelands-1.1/src/logic/single_player_game_settings_provider.h~ 2022-10-22
13:51:16.000000000 +0200
++++ widelands-1.1/src/logic/single_player_game_settings_provider.h 2023-03-27
22:59:30.908486580 +0200
+@@ -19,6 +19,8 @@
+ #ifndef WL_LOGIC_SINGLE_PLAYER_GAME_SETTINGS_PROVIDER_H
+ #define WL_LOGIC_SINGLE_PLAYER_GAME_SETTINGS_PROVIDER_H
+
++#include <cstdint>
++
+ #include "logic/game_settings.h"
+
+ /**
+diff -up widelands-1.1/src/graphic/text/textstream.h~
widelands-1.1/src/graphic/text/textstream.h
+--- widelands-1.1/src/graphic/text/textstream.h~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/graphic/text/textstream.h 2023-03-27 23:05:15.095850210 +0200
+@@ -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/widelands-build19-ppc64le.patch b/widelands-build19-ppc64le.patch
index d1a092c..3142f2e 100644
--- a/widelands-build19-ppc64le.patch
+++ b/widelands-build19-ppc64le.patch
@@ -1,11 +1,9 @@
-diff -up widelands-1.0/CMakeLists.txt~ widelands-1.0/CMakeLists.txt
---- widelands-1.0/CMakeLists.txt~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/CMakeLists.txt 2022-03-04 17:22:38.799386008 +0100
-@@ -314,9 +314,8 @@ if(NOT MSVC)
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
+diff -up widelands-1.1/CMakeLists.txt~ widelands-1.1/CMakeLists.txt
+--- widelands-1.1/CMakeLists.txt~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/CMakeLists.txt 2023-03-27 20:45:53.395721787 +0200
+@@ -395,7 +395,7 @@ if(NOT MSVC)
+ endif()
+ endif()
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
diff --git a/widelands-build20-gcc10.patch b/widelands-build20-gcc10.patch
index 8787c49..ef56ff0 100644
--- a/widelands-build20-gcc10.patch
+++ b/widelands-build20-gcc10.patch
@@ -7,24 +7,24 @@ For some reason the s390x build (and only the s390x build) fails with:
cc1plus: some warnings being treated as errors
This fixes this.
-diff -up widelands-1.0/src/ui_basic/box.cc~ widelands-1.0/src/ui_basic/box.cc
---- widelands-1.0/src/ui_basic/box.cc~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/src/ui_basic/box.cc 2022-03-04 17:24:19.916850150 +0100
-@@ -177,7 +177,7 @@ void Box::layout() {
- int spacing = -inner_spacing_;
+diff -up widelands-1.1/src/ui_basic/box.cc~ widelands-1.1/src/ui_basic/box.cc
+--- widelands-1.1/src/ui_basic/box.cc~ 2022-10-22 13:51:16.000000000 +0200
++++ widelands-1.1/src/ui_basic/box.cc 2023-03-27 20:56:58.130613954 +0200
+@@ -178,7 +178,7 @@ void Box::layout() {
+ int spacing = -1 * inner_spacing_;
for (size_t idx = 0; idx < items_.size(); ++idx) {
-- int depth, unused = 0;
-+ int depth = 0, unused = 0;
+- int depth;
++ int depth = 0;
+ int unused = 0;
get_item_desired_size(idx, &depth, &unused);
totaldepth += depth;
- if (items_[idx].type != Item::ItemPanel || items_[idx].u.panel.panel->is_visible())
{
-@@ -270,7 +270,7 @@ void Box::update_positions() {
+@@ -275,7 +275,7 @@ void Box::update_positions() {
}
for (uint32_t idx = 0; idx < items_.size(); ++idx) {
-- int depth, breadth = 0;
-+ int depth = 0, breadth = 0;
+- int depth;
++ int depth = 0;
+ int breadth = 0;
get_item_size(idx, &depth, &breadth);
- if (items_[idx].type == Item::ItemPanel) {
diff --git a/widelands.spec b/widelands.spec
index e56cf8e..095f4da 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -2,15 +2,13 @@
%global fonts font(amiri) font(dejavusans) font(dejavusansmono) font(dejavuserif)
font(widelands) font(gargi) font(wenquanyimicrohei) font(frankruehlclm)
Name: widelands
-Version: 1.0
-Release: 6%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: Open source realtime-strategy game
License: GPLv2+
URL:
http://www.widelands.org
-Source0:
https://launchpad.net/widelands/1.x/%{version}/+download/widelands-%{vers...
-Source1:
https://launchpad.net/widelands/1.x/%{version}/+download/widelands-%{vers...
-Source2: gpgkey-B79C81844E3EFFC3726CD477D53DCA9A6A3B14A4.gpg
+Source0:
https://github.com/widelands/widelands/archive/v%{version}/%{name}-%{vers...
# gnu++11 fix in CMakeLists.txt for PPC64 little-endian
# + remove -Werror=uninitialized to fix build with gcc12
Patch0: widelands-build19-ppc64le.patch
@@ -22,8 +20,10 @@ Patch1: widelands-build20-gcc10.patch
# at glew 2.3, or maybe backport:
#
https://github.com/nigels-com/glew/commit/715afa0ff56c0eb12c23938b80aa281...
Patch2: widelands-1.0-make-sdl2-use-x11.patch
-Patch3: widelands-1.0-gcc12.1.patch
+Patch3: widelands-1.1-gcc13.patch
+Patch4: widelands-1.1-f37-sys-minizip-buildfix.patch
+BuildRequires: asio-devel
BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
BuildRequires: SDL2_mixer-devel
@@ -39,8 +39,8 @@ BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: libpng-devel
BuildRequires: libcurl-devel
+BuildRequires: minizip-devel
BuildRequires: python3
-BuildRequires: gnupg2
# For the %%build part generating the symlinks
BuildRequires: fontconfig %{fonts}
Requires: hicolor-icon-theme
@@ -54,14 +54,12 @@ perhaps will have a thought, what Widelands is all about.
%prep
-gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%autosetup -p1
%build
%cmake \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=%{_bindir} \
-DWL_INSTALL_BASEDIR=%{_prefix}/share/%{name} \
-DWL_INSTALL_DATADIR=%{_prefix}/share/%{name} \
-DOPTION_BUILD_WEBSITE_TOOLS=OFF \
@@ -72,6 +70,10 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%install
%cmake_install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} \
+ $RPM_BUILD_ROOT%{_bindir}/%{name}
+
# Validate desktop file (provided by upstream)
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -188,6 +190,10 @@ popd
%changelog
+* Mon Mar 27 2023 Hans de Goede <hdegoede(a)redhat.com> - 1.1-1
+- New upstream release 1.1 (rhbz#2135131)
+- Fix FTBFS (rhbz#2171759)
+
* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
commit 7c8a59603b437a6ad01a911f5ff54da31b4f4012
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jan 21 06:49:11 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/widelands.spec b/widelands.spec
index c11b662..e56cf8e 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -3,7 +3,7 @@
Name: widelands
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Open source realtime-strategy game
License: GPLv2+
@@ -188,6 +188,9 @@ popd
%changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
* Sat Dec 31 2022 Pete Walter <pwalter(a)fedoraproject.org> - 1.0-5
- Rebuild for ICU 72
commit bf48c8638de564e0fdf9dea52ec140ae77aee93d
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Sat Dec 31 03:49:48 2022 +0000
Rebuild for ICU 72
diff --git a/widelands.spec b/widelands.spec
index 5c94288..c11b662 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -3,7 +3,7 @@
Name: widelands
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open source realtime-strategy game
License: GPLv2+
@@ -188,6 +188,9 @@ popd
%changelog
+* Sat Dec 31 2022 Pete Walter <pwalter(a)fedoraproject.org> - 1.0-5
+- Rebuild for ICU 72
+
* Sun Aug 14 2022 Hans de Goede <hdegoede(a)redhat.com> - 1.0-4
- Fix FTBFS (rhbz#2114565)