Compare commits
No commits in common. "rawhide" and "f34" have entirely different histories.
13 changed files with 69 additions and 475 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -6,10 +6,3 @@ Widelands-Build14-src.7z
|
|||
/widelands-build19-src-gcc7.tar.bz2
|
||||
/widelands-build20.tar.bz2
|
||||
/widelands-build21.tar.gz
|
||||
/widelands-1.0.tar.gz
|
||||
/widelands-1.0.tar.gz.asc
|
||||
/widelands-1.1.tar.gz
|
||||
/widelands-1.2.tar.gz
|
||||
/widelands-1.2.1.tar.gz
|
||||
/widelands-1.3.tar.gz
|
||||
/widelands-1.3.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (widelands-1.3.1.tar.gz) = 47d72aabac1dc873dd6f6fa86ba0bf2b0dd13c298f10df89b47654397ab5b3a55c06d4e8cf6a0da807e3402a7bff0839b7b0b18a6f8611ee83d252b8e0d61f15
|
||||
SHA512 (widelands-build21.tar.gz) = 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -uNr widelands-1.2.orig/src/ui_basic/box.cc widelands-1.2/src/ui_basic/box.cc
|
||||
--- widelands-1.2.orig/src/ui_basic/box.cc 2024-03-28 11:12:05.000000000 +0100
|
||||
+++ widelands-1.2/src/ui_basic/box.cc 2024-08-25 12:02:46.697000000 +0200
|
||||
@@ -180,7 +180,7 @@
|
||||
int infspace_count = 0;
|
||||
|
||||
for (size_t idx = 0; idx < items_.size(); ++idx) {
|
||||
- int depth;
|
||||
+ int depth = 0;
|
||||
int unused = 0;
|
||||
get_item_desired_size(idx, &depth, &unused);
|
||||
totaldepth += depth;
|
||||
@@ -274,7 +274,7 @@
|
||||
// Do not modify hidden items
|
||||
continue;
|
||||
}
|
||||
- int depth;
|
||||
+ int depth = 0;
|
||||
int breadth = 0;
|
||||
get_item_size(idx, &depth, &breadth);
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -uNr widelands.orig/src/base/test/CMakeLists.txt widelands/src/base/test/CMakeLists.txt
|
||||
--- widelands.orig/src/base/test/CMakeLists.txt 2024-11-12 21:03:25.000000000 +0100
|
||||
+++ widelands/src/base/test/CMakeLists.txt 2025-02-16 12:21:07.246000000 +0100
|
||||
@@ -7,7 +7,6 @@
|
||||
test_times.cc
|
||||
test_time_string.cc
|
||||
test_utf8.cc
|
||||
- test_string.cc
|
||||
DEPENDS
|
||||
base
|
||||
base_crypto
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr widelands-1.3.orig/CMakeLists.txt widelands-1.3/CMakeLists.txt
|
||||
--- widelands-1.3.orig/CMakeLists.txt 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/CMakeLists.txt 2025-12-21 13:08:24.503000000 +0100
|
||||
@@ -292,7 +292,7 @@
|
||||
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-disabled-macro-expansion")
|
||||
endif()
|
||||
elseif(MSVC)
|
||||
- wl_add_flag(WL_GENERIC_CXX_FLAGS "/std:c++17")
|
||||
+ wl_add_flag(WL_GENERIC_CXX_FLAGS "/std:gnu++17")
|
||||
wl_add_flag(WL_GENERIC_C_LIBRARY_FLAGS "/std:c11")
|
||||
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/
|
||||
# Disabled warnings that are overly verbose right now or just do not make sense.
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -uNr widelands-1.3.orig/cmake/WlFunctions.cmake widelands-1.3/cmake/WlFunctions.cmake
|
||||
--- widelands-1.3.orig/cmake/WlFunctions.cmake 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/cmake/WlFunctions.cmake 2025-12-21 13:32:50.138000000 +0100
|
||||
@@ -93,7 +93,9 @@
|
||||
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)
|
||||
|
|
@ -1,180 +0,0 @@
|
|||
diff -uNr widelands-1.3.orig/src/commands/cmd_queue.h widelands-1.3/src/commands/cmd_queue.h
|
||||
--- widelands-1.3.orig/src/commands/cmd_queue.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/commands/cmd_queue.h 2025-12-21 13:22:54.968000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_COMMANDS_CMD_QUEUE_H
|
||||
#define WL_COMMANDS_CMD_QUEUE_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <queue>
|
||||
|
||||
#include "commands/command.h"
|
||||
diff -uNr widelands-1.3.orig/src/io/filesystem/zip_filesystem.h widelands-1.3/src/io/filesystem/zip_filesystem.h
|
||||
--- widelands-1.3.orig/src/io/filesystem/zip_filesystem.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/io/filesystem/zip_filesystem.h 2025-12-21 13:21:40.240000000 +0100
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <unzip.h>
|
||||
#include <zip.h>
|
||||
+#include <zlib.h>
|
||||
|
||||
#include "io/filesystem/filesystem.h"
|
||||
#include "io/streamread.h"
|
||||
diff -uNr widelands-1.3.orig/src/logic/addons.h widelands-1.3/src/logic/addons.h
|
||||
--- widelands-1.3.orig/src/logic/addons.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/addons.h 2025-12-21 13:22:00.559000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_ADDONS_H
|
||||
#define WL_LOGIC_ADDONS_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <ctime>
|
||||
#include <functional>
|
||||
#include <map>
|
||||
diff -uNr widelands-1.3.orig/src/logic/ai_dna_handler.h widelands-1.3/src/logic/ai_dna_handler.h
|
||||
--- widelands-1.3.orig/src/logic/ai_dna_handler.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/ai_dna_handler.h 2025-12-21 13:22:21.467000000 +0100
|
||||
@@ -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 -uNr widelands-1.3.orig/src/logic/game_controller.h widelands-1.3/src/logic/game_controller.h
|
||||
--- widelands-1.3.orig/src/logic/game_controller.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/game_controller.h 2025-12-21 13:23:11.328000000 +0100
|
||||
@@ -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 -uNr widelands-1.3.orig/src/logic/game.h widelands-1.3/src/logic/game.h
|
||||
--- widelands-1.3.orig/src/logic/game.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/game.h 2025-12-21 13:23:32.586000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_GAME_H
|
||||
#define WL_LOGIC_GAME_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include "base/crypto.h"
|
||||
diff -uNr widelands-1.3.orig/src/logic/game_settings.h widelands-1.3/src/logic/game_settings.h
|
||||
--- widelands-1.3.orig/src/logic/game_settings.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/game_settings.h 2025-12-21 13:23:53.751000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_GAME_SETTINGS_H
|
||||
#define WL_LOGIC_GAME_SETTINGS_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
diff -uNr widelands-1.3.orig/src/logic/mapastar.h widelands-1.3/src/logic/mapastar.h
|
||||
--- widelands-1.3.orig/src/logic/mapastar.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/mapastar.h 2025-12-21 13:24:10.835000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_MAPASTAR_H
|
||||
#define WL_LOGIC_MAPASTAR_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include "logic/map.h"
|
||||
diff -uNr widelands-1.3.orig/src/logic/map.h widelands-1.3/src/logic/map.h
|
||||
--- widelands-1.3.orig/src/logic/map.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/map.h 2025-12-21 13:24:25.286000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_MAP_H
|
||||
#define WL_LOGIC_MAP_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
diff -uNr widelands-1.3.orig/src/logic/maphollowregion.h widelands-1.3/src/logic/maphollowregion.h
|
||||
--- widelands-1.3.orig/src/logic/maphollowregion.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/maphollowregion.h 2025-12-21 13:24:38.671000000 +0100
|
||||
@@ -19,6 +19,8 @@
|
||||
#ifndef WL_LOGIC_MAPHOLLOWREGION_H
|
||||
#define WL_LOGIC_MAPHOLLOWREGION_H
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "logic/map.h"
|
||||
|
||||
namespace Widelands {
|
||||
diff -uNr widelands-1.3.orig/src/logic/message_queue.h widelands-1.3/src/logic/message_queue.h
|
||||
--- widelands-1.3.orig/src/logic/message_queue.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/message_queue.h 2025-12-21 13:24:53.770000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_MESSAGE_QUEUE_H
|
||||
#define WL_LOGIC_MESSAGE_QUEUE_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cassert>
|
||||
#include <memory>
|
||||
|
||||
diff -uNr widelands-1.3.orig/src/logic/pathfield.h widelands-1.3/src/logic/pathfield.h
|
||||
--- widelands-1.3.orig/src/logic/pathfield.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/pathfield.h 2025-12-21 13:25:10.868000000 +0100
|
||||
@@ -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 -uNr widelands-1.3.orig/src/logic/player.h widelands-1.3/src/logic/player.h
|
||||
--- widelands-1.3.orig/src/logic/player.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/player.h 2025-12-21 13:27:20.228000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_PLAYER_H
|
||||
#define WL_LOGIC_PLAYER_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <atomic>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
diff -uNr widelands-1.3.orig/src/logic/replay_game_controller.h widelands-1.3/src/logic/replay_game_controller.h
|
||||
--- widelands-1.3.orig/src/logic/replay_game_controller.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/replay_game_controller.h 2025-12-21 13:28:10.806000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef WL_LOGIC_REPLAY_GAME_CONTROLLER_H
|
||||
#define WL_LOGIC_REPLAY_GAME_CONTROLLER_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
#include "commands/command.h"
|
||||
diff -uNr widelands-1.3.orig/src/logic/single_player_game_controller.h widelands-1.3/src/logic/single_player_game_controller.h
|
||||
--- widelands-1.3.orig/src/logic/single_player_game_controller.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/single_player_game_controller.h 2025-12-21 13:28:30.527000000 +0100
|
||||
@@ -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 -uNr widelands-1.3.orig/src/logic/single_player_game_settings_provider.h widelands-1.3/src/logic/single_player_game_settings_provider.h
|
||||
--- widelands-1.3.orig/src/logic/single_player_game_settings_provider.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/single_player_game_settings_provider.h 2025-12-21 13:28:46.109000000 +0100
|
||||
@@ -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"
|
||||
|
||||
/**
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
diff -uNr widelands-1.3.orig/src/logic/map_objects/tribes/requirements.h widelands-1.3/src/logic/map_objects/tribes/requirements.h
|
||||
--- widelands-1.3.orig/src/logic/map_objects/tribes/requirements.h 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/logic/map_objects/tribes/requirements.h 2025-12-21 13:36:41.437000000 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
#define WL_LOGIC_MAP_OBJECTS_TRIBES_REQUIREMENTS_H
|
||||
|
||||
#include <climits>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
diff -uNr widelands-1.3.orig/src/third_party/eris/eris.c widelands-1.3/src/third_party/eris/eris.c
|
||||
--- widelands-1.3.orig/src/third_party/eris/eris.c 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/third_party/eris/eris.c 2025-12-21 13:37:22.685000000 +0100
|
||||
@@ -27,13 +27,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
-
|
||||
-/* Not using stdbool because Visual Studio lives in the past... */
|
||||
-#ifndef __cplusplus
|
||||
-typedef int bool;
|
||||
-#define false 0
|
||||
-#define true 1
|
||||
-#endif
|
||||
+#include <stdbool.h>
|
||||
|
||||
/* Mark us as part of the Lua core to get access to what we need. */
|
||||
#define LUA_CORE
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
diff -uNr widelands-1.3.orig/src/graphic/text/test/render_richtext.cc widelands-1.3/src/graphic/text/test/render_richtext.cc
|
||||
--- widelands-1.3.orig/src/graphic/text/test/render_richtext.cc 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/graphic/text/test/render_richtext.cc 2025-12-21 13:16:33.279000000 +0100
|
||||
@@ -114,6 +114,9 @@
|
||||
if (parse_arguments(argc, argv, &w, outname, inname, allowed_tags))
|
||||
return 0;
|
||||
|
||||
+ // GLEW only supports glx atm, force use of X11 even under Wayland
|
||||
+ // https://github.com/nigels-com/glew/issues/172
|
||||
+ setenv("SDL_VIDEODRIVER", "x11", 0);
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
std::cerr << "SDLInit did not succeed: " << SDL_GetError() << std::endl;
|
||||
return 1;
|
||||
diff -uNr widelands-1.3.orig/src/website/website_common.cc widelands-1.3/src/website/website_common.cc
|
||||
--- widelands-1.3.orig/src/website/website_common.cc 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/website/website_common.cc 2025-12-21 13:17:16.715000000 +0100
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "website/website_common.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
#include <SDL.h>
|
||||
|
||||
#include "base/i18n.h"
|
||||
@@ -33,6 +34,9 @@
|
||||
set_initializer_thread();
|
||||
g_verbose = true;
|
||||
|
||||
+ // GLEW only supports glx atm, force use of X11 even under Wayland
|
||||
+ // https://github.com/nigels-com/glew/issues/172
|
||||
+ setenv("SDL_VIDEODRIVER", "x11", 0);
|
||||
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 -uNr widelands-1.3.orig/src/wlapplication.cc widelands-1.3/src/wlapplication.cc
|
||||
--- widelands-1.3.orig/src/wlapplication.cc 2025-12-18 19:19:33.000000000 +0100
|
||||
+++ widelands-1.3/src/wlapplication.cc 2025-12-21 13:17:48.848000000 +0100
|
||||
@@ -401,6 +401,9 @@
|
||||
#endif
|
||||
|
||||
// Start the SDL core
|
||||
+ // GLEW only supports glx atm, force use of X11 even under Wayland
|
||||
+ // https://github.com/nigels-com/glew/issues/172
|
||||
+ setenv("SDL_VIDEODRIVER", "x11", 0);
|
||||
if (SDL_Init(SDL_INIT_VIDEO) == -1) {
|
||||
// We sometimes run into a missing video driver in our CI environment, so we exit 0 to prevent
|
||||
// too frequent failures
|
||||
13
widelands-build19-ppc64le.patch
Normal file
13
widelands-build19-ppc64le.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 018d9ea08a..8fadae6402 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -205,7 +205,7 @@ else()
|
||||
message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||
endif()
|
||||
|
||||
-wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
|
||||
+wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
|
||||
|
||||
if(OPTION_ASAN)
|
||||
message(STATUS "Using AddressSanitizer https://clang.llvm.org/docs/AddressSanitizer.html")
|
||||
30
widelands-build20-gcc10.patch
Normal file
30
widelands-build20-gcc10.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
For some reason the s390x build (and only the s390x build) fails with:
|
||||
|
||||
/builddir/build/BUILD/widelands-build20/src/ui_basic/box.cc: In member function 'virtual void UI::Box::layout()':
|
||||
/builddir/build/BUILD/widelands-build20/src/ui_basic/box.cc:163:14: error: 'depth' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||
163 | totaldepth += depth;
|
||||
| ~~~~~~~~~~~^~~~~~~~
|
||||
cc1plus: some warnings being treated as errors
|
||||
|
||||
This fixes this.
|
||||
diff -Nrup a/src/ui_basic/box.cc b/src/ui_basic/box.cc
|
||||
--- a/src/ui_basic/box.cc 2019-05-01 23:23:39.000000000 -0600
|
||||
+++ b/src/ui_basic/box.cc 2019-11-12 16:10:28.893117299 -0700
|
||||
@@ -158,7 +158,7 @@ void Box::layout() {
|
||||
int totaldepth = 0;
|
||||
|
||||
for (size_t idx = 0; idx < items_.size(); ++idx) {
|
||||
- int depth, unused = 0;
|
||||
+ int depth = 0, unused = 0;
|
||||
get_item_desired_size(idx, &depth, &unused);
|
||||
totaldepth += depth;
|
||||
}
|
||||
@@ -246,7 +246,7 @@ void Box::update_positions() {
|
||||
}
|
||||
|
||||
for (uint32_t idx = 0; idx < items_.size(); ++idx) {
|
||||
- int depth, breadth = 0;
|
||||
+ int depth = 0, breadth = 0;
|
||||
get_item_size(idx, &depth, &breadth);
|
||||
|
||||
if (items_[idx].type == Item::ItemPanel) {
|
||||
|
|
@ -1,4 +1,2 @@
|
|||
# The symlinks to system fonts are dangling when only looking at this pkg
|
||||
addFilter("dangling-symlink")
|
||||
# Ignore new useless rpmlint warning
|
||||
addFilter("files-duplicate")
|
||||
|
|
|
|||
174
widelands.spec
174
widelands.spec
|
|
@ -1,31 +1,23 @@
|
|||
%undefine __cmake_in_source_build
|
||||
|
||||
%global buildno 21
|
||||
%global buildid build%{buildno}
|
||||
# The game contains a copy of these fonts, we replace these with symlinks to the system versions of these fonts
|
||||
%global fonts font(amiri) font(dejavusans) font(dejavusansmono) font(dejavuserif) font(widelands) font(gargi) font(wenquanyimicrohei) font(frankruehlclm)
|
||||
|
||||
Name: widelands
|
||||
Version: 1.3.1
|
||||
Release: 3%{?dist}
|
||||
Version: 0
|
||||
Release: 0.84.%{buildid}%{?dist}
|
||||
Summary: Open source realtime-strategy game
|
||||
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
URL: http://www.widelands.org
|
||||
Source0: https://github.com/widelands/widelands/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/widelands/widelands/archive/%{buildid}/%{name}-%{buildid}.tar.gz
|
||||
# gnu++11 fix in CMakeLists.txt for PPC64 little-endian
|
||||
Patch0: widelands-1.3-build19-ppc64le.patch
|
||||
Patch0: widelands-build19-ppc64le.patch
|
||||
# Fix failures on s390x due to uninitialized variables
|
||||
Patch1: widelands-1.2-build20-gcc10.patch
|
||||
# widelands uses glew which atm is hardcoded to glx, see e.g.:
|
||||
# https://github.com/nigels-com/glew/issues/172
|
||||
# This can be fixed cleaner by switching to glewContextInit once we are
|
||||
# at glew 2.3, or maybe backport:
|
||||
# https://github.com/nigels-com/glew/commit/715afa0ff56c0eb12c23938b80aa2813daa10d81
|
||||
Patch2: widelands-1.3-make-sdl2-use-x11.patch
|
||||
Patch3: widelands-1.3-gcc13.patch
|
||||
Patch4: widelands-1.3-f37-sys-minizip-buildfix.patch
|
||||
Patch5: widelands-1.2.1-disable-some-tests.patch
|
||||
Patch6: widelands-1.3-gcc15.patch
|
||||
Patch1: widelands-build20-gcc10.patch
|
||||
|
||||
BuildRequires: asio-devel
|
||||
BuildRequires: SDL2-devel
|
||||
BuildRequires: SDL2_image-devel
|
||||
BuildRequires: SDL2_mixer-devel
|
||||
|
|
@ -35,13 +27,11 @@ BuildRequires: cmake
|
|||
BuildRequires: ctags
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: libpng-devel >= 1.6.0
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: minizip-ng-compat-devel
|
||||
BuildRequires: python3
|
||||
BuildRequires: libpng-devel
|
||||
# For the %%build part generating the symlinks
|
||||
BuildRequires: fontconfig %{fonts}
|
||||
Requires: hicolor-icon-theme
|
||||
|
|
@ -55,21 +45,16 @@ perhaps will have a thought, what Widelands is all about.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n widelands
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p1
|
||||
%patch -P2 -p1
|
||||
%patch -P3 -p1
|
||||
%patch -P4 -p1
|
||||
%ifarch s390x
|
||||
%patch -P5 -p1
|
||||
%endif
|
||||
%patch -P6 -p1
|
||||
%setup -q -n widelands-%{buildid}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
LDFLAGS=-lGL
|
||||
%cmake \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-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 \
|
||||
|
|
@ -80,15 +65,11 @@ perhaps will have a thought, what Widelands is all about.
|
|||
%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
|
||||
|
||||
# Validate appdata (provided by upstream)
|
||||
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.metainfo.xml
|
||||
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml
|
||||
|
||||
pushd $RPM_BUILD_ROOT
|
||||
# Replace fonts with system fonts. We used to have symlinks directly from
|
||||
|
|
@ -144,14 +125,6 @@ ln -s $(fc-match -f "%{file}" "monospace:italic") \
|
|||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansMono-Oblique.ttf
|
||||
ln -s $(fc-match -f "%{file}" "monospace:bold:italic") \
|
||||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansMono-BoldOblique.ttf
|
||||
ln -s $(fc-match -f "%{file}" "DejaVuSansCondensed") \
|
||||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansCondensed.ttf
|
||||
ln -s $(fc-match -f "%{file}" "DejaVuSansCondensed:bold") \
|
||||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansCondensed-Bold.ttf
|
||||
ln -s $(fc-match -f "%{file}" "DejaVuSansCondensed:italic") \
|
||||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansCondensed-Oblique.ttf
|
||||
ln -s $(fc-match -f "%{file}" "DejaVuSansCondensed:bold:italic") \
|
||||
usr/share/%{name}/i18n/fonts/dejavu-fonts/DejaVuSansCondensed-BoldOblique.ttf
|
||||
|
||||
# Chinese fonts
|
||||
rm -r usr/share/%{name}/i18n/fonts/MicroHei
|
||||
|
|
@ -189,9 +162,9 @@ ln -s $(fc-match -f "%{file}" "widelands") \
|
|||
|
||||
|
||||
# Scripting magic to add proper %%lang() markings to the locale files
|
||||
find usr/share/widelands/i18n/translations/ -maxdepth 2 -type f -name \*_\*.po | sed -n 's#\(usr/share/widelands/i18n/translations/.*/\([^/]*\)_[^/]*\.po\)#%lang(\2) /\1#p' > %{_builddir}/%{?buildsubdir}/%{name}.files
|
||||
find usr/share/widelands/i18n/translations/ -maxdepth 2 -type f -name \*.po -and ! -name "*_*.po" | sed -n -e 's#\(usr/share/widelands/i18n/translations/.*/\([^/]\+\)\.po\)#%lang(\2) /\1#p' >> %{_builddir}/%{?buildsubdir}/%{name}.files
|
||||
find usr/share/widelands/ -mindepth 1 -maxdepth 1 -not -name i18n | sed -n 's#\(usr/share/widelands/*\)#/\1#p' >> %{_builddir}/%{?buildsubdir}/%{name}.files
|
||||
find usr/share/widelands/locale/ -maxdepth 1 -type d -name \*_\* | sed -n 's#\(usr/share/widelands/locale/\(.*\)_.*\)#%lang(\2) /\1#p' > %{_builddir}/widelands-%{buildid}/%{name}.files
|
||||
find usr/share/widelands/locale/ -maxdepth 1 -type d ! -name "*_*" | sed -n -e 's#\(usr/share/widelands/locale/\(.\+\)\)#%lang(\2) /\1#p' >> %{_builddir}/widelands-%{buildid}/%{name}.files
|
||||
find usr/share/widelands/ -mindepth 1 -maxdepth 1 -not -name locale | sed -n 's#\(usr/share/widelands/*\)#/\1#p' >> %{_builddir}/widelands-%{buildid}/%{name}.files
|
||||
popd
|
||||
|
||||
|
||||
|
|
@ -201,112 +174,13 @@ popd
|
|||
%{_mandir}/man6/widelands.6.gz
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{_metainfodir}/*.metainfo.xml
|
||||
%{_metainfodir}/*.appdata.xml
|
||||
%{_datadir}/applications/*.desktop
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/i18n/fonts.lua
|
||||
%{_datadir}/%{name}/i18n/fonts
|
||||
%{_datadir}/%{name}/i18n/locales.lua
|
||||
%{_datadir}/%{name}/i18n/locales/*.json
|
||||
%{_datadir}/%{name}/i18n/translation_stats.conf
|
||||
%{_datadir}/%{name}/i18n/translations/*/*.pot
|
||||
%dir %{_datadir}/%{name}/locale
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Mon Jun 08 2026 František Zatloukal <fzatlouk@redhat.com> - 1.3.1-2
|
||||
- Rebuilt for icu 78.3
|
||||
|
||||
* Sun Feb 22 2026 Peter Hanecak <hany@hany.sk> - 1.3.1-1
|
||||
- New upstream release 1.3.1 (rhbz#2440036)
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Sun Dec 21 2025 Peter Hanecak <hany@hany.sk> - 1.3-1
|
||||
- New upstream release 1.3 (rhbz#2422054)
|
||||
|
||||
* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 1.2.1-3
|
||||
- Rebuilt for icu 77.1
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Feb 16 2025 Peter Hanecak <hany@hany.sk> - 1.2.1-1
|
||||
- New upstream release 1.2 (rhbz#2322776)
|
||||
- Generate font file symlinks also for DejaVuSansCondensed (rhbz#2334803)
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sun Dec 08 2024 Pete Walter <pwalter@fedoraproject.org> - 1.2-2
|
||||
- Rebuild for ICU 76
|
||||
|
||||
* Sun Aug 25 2024 Peter Hanecak <hany@hany.sk> - 1.2-1
|
||||
- New upstream release 1.2 (rhbz#2271240)
|
||||
|
||||
* Wed Aug 07 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1-8
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 1.1-6
|
||||
- Rebuild for ICU 74
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Dec 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 1.1-4
|
||||
- Rebuilt for minizip-ng transition Fedora change
|
||||
- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 1.1-2
|
||||
- Rebuilt for ICU 73.2
|
||||
|
||||
* Mon Mar 27 2023 Hans de Goede <hdegoede@redhat.com> - 1.1-1
|
||||
- New upstream release 1.1 (rhbz#2135131)
|
||||
- Fix FTBFS (rhbz#2171759)
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 1.0-5
|
||||
- Rebuild for ICU 72
|
||||
|
||||
* Sun Aug 14 2022 Hans de Goede <hdegoede@redhat.com> - 1.0-4
|
||||
- Fix FTBFS (rhbz#2114565)
|
||||
|
||||
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.0-3
|
||||
- Rebuilt for ICU 71.1
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Mar 6 2022 Hans de Goede <hdegoede@redhat.com> - 1.0-1
|
||||
- New upstream release 1.0 (rhbz1974007)
|
||||
- Fix FTBFS (rhbz2047116)
|
||||
|
||||
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0-0.89.build21
|
||||
- Rebuild for glew 2.2
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.88.build21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 0-0.87.build21
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.86.build21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 0-0.85.build21
|
||||
- Rebuild for ICU 69
|
||||
|
||||
* Mon Apr 19 2021 Hans de Goede <hdegoede@redhat.com> - 0-0.84.build21
|
||||
- Stop replacing dirs with symlinks this breaks upgrades again (rhbz 1947182)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue