diff --git a/widelands-1.1-gcc-13.2.0.patch b/widelands-1.1-gcc-13.2.0.patch new file mode 100644 index 0000000..c2f2501 --- /dev/null +++ b/widelands-1.1-gcc-13.2.0.patch @@ -0,0 +1,124 @@ +https://github.com/widelands/widelands/pull/5765 + +From 14b9c357073126d11d719fd1a539bb7ef0154791 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 25 Jan 2023 23:42:42 +0100 +Subject: [PATCH] Fix build with gcc 13 by including + +Like other versions before, gcc 13 moved some includes around and as a +result 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 ++#include + #include + #include + +--- a/src/base/random.h ++++ b/src/base/random.h +@@ -20,6 +20,7 @@ + #define WL_BASE_RANDOM_H + + #include ++#include + #include + + 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 + #include + + /// 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 + #include + + 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 + #include + + #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 + #include + + 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 + #include + + #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 + #include + + 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 ++ + #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 + #include + #include + +--- 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 ++ + #include "scripting/lua.h" + + class FileRead; +-- +2.39.1 diff --git a/widelands-17-gcc-4.7.patch b/widelands-17-gcc-4.7.patch deleted file mode 100644 index bd1f8d9..0000000 --- a/widelands-17-gcc-4.7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- widelands-build17-src/src/main.cc.orig 2013-07-15 13:22:34.201117347 +0200 -+++ widelands-build17-src/src/main.cc 2013-07-15 13:22:48.369970197 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/widelands.flagfix.patch b/widelands.flagfix.patch deleted file mode 100644 index 8e54226..0000000 --- a/widelands.flagfix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py ---- ./build/scons-tools/scons_configure.py.flagfix 2008-04-06 20:39:50.000000000 +0200 -+++ ./build/scons-tools/scons_configure.py 2008-04-06 20:40:32.000000000 +0200 -@@ -440,35 +440,7 @@ def do_configure_compiler_warnings(confi - #conf.CheckCompilerFlag('-Werror', env) - - def do_configure_compiler_features(config_h_file, conf, env): -- conf.CheckCompilerFlag('-fstack-protector-all', env) -- conf.CheckCompilerFlag('-fbounds-check', env) -- conf.CheckCompilerFlag('-pipe', env) -- -- if env.optimize: -- # !!!! -fomit-frame-pointer breaks execeptions !!!! -- conf.CheckCompilerFlag('-fexpensive-optimizations', env) -- conf.CheckCompilerFlag('-finline-functions', env) -- conf.CheckCompilerFlag('-ffast-math', env) -- conf.CheckCompilerFlag('-funroll-loops', env) -- conf.CheckCompilerFlag('-O3', env) -- else: -- conf.CheckCompilerFlag('-O0', env) -- -- if env.profile: -- conf.CheckCompilerFlag('-pg', env) -- conf.CheckCompilerFlag('-fprofile-arcs', env) -- -- if env.debug: -- conf.CheckCompilerFlag('-g', env) -- conf.CheckCompilerFlag('-fmessage-length=0', env) -- --def do_configure_linker_features(config_h_file, conf, env): -- if env.profile: -- conf.CheckLinkerFlag('-pg', env) -- conf.CheckLinkerFlag('-fprofile-arcs', env) -- -- if env.strip: -- conf.CheckLinkerFlag('-s', env) -+ conf.CheckCompilerFlag('flagi', env) - - def do_configure(conf, env): - config_h_file=write_configh_header() -@@ -480,7 +452,6 @@ def do_configure(conf, env): - - do_configure_compiler_warnings(config_h_file, conf, env) - do_configure_compiler_features(config_h_file, conf, env) -- do_configure_linker_features(config_h_file, conf, env) - - write_configh(config_h_file, env) - write_configh_footer(config_h_file) diff --git a/widelands.spec b/widelands.spec index 820e7e6..9f9d235 100644 --- a/widelands.spec +++ b/widelands.spec @@ -1,34 +1,31 @@ Name: widelands Epoch: 1 -Version: 1.0 +Version: 1.1 Release: 1mamba Summary: A game like Settlers II Group: Graphical Desktop/Applications/Games Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://widelands.sourceforge.net/ -Source: https://launchpad.net/widelands/1.x/1.0/+download/widelands-%{version}.tar.gz -Patch0: widelands.flagfix.patch -Patch1: widelands-17-gcc-4.7.patch +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 BuildRequires: libSDL2-devel -BuildRequires: libSDL2_ttf-devel -BuildRequires: libboost-devel -BuildRequires: libcurl-devel BuildRequires: libgcc BuildRequires: libglew-devel BuildRequires: libglvnd-devel BuildRequires: libicu-devel +BuildRequires: libminizip1-devel BuildRequires: libpng-devel BuildRequires: libsdl2_image-devel BuildRequires: libsdl2_mixer-devel +BuildRequires: libsdl2_ttf-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -#BuildRequires: libSDL_gfx-devel >= 2.0.26 BuildRequires: libglew-devel >= 1.9.0 BuildRequires: ctags BuildRequires: desktop-file-utils @@ -46,17 +43,15 @@ In Widelands, you are the regent of a small tribe. You start out with nothing bu %prep %setup -q #-D -T -#%patch1 -p1 +#:<< _EOF +%patch 0 -p1 -b .gcc-13.2.0 %build #:<< _EOF %cmake -d build \ -DWL_INSTALL_BASEDIR=%{_prefix} \ - -DWL_INSTALL_DATADIR=%{_datadir}/widelands - -#../ \ -# -DLUA_LIBRARY=%{_libdir}/liblua.so.5.1 \ -# -DLUA_INCLUDE_DIR=`pkg-config --variable=includedir lua5.1` + -DWL_INSTALL_DATADIR=%{_datadir}/widelands \ + -DWL_INSTALL_BINDIR=%{_bindir} %make @@ -64,56 +59,29 @@ In Widelands, you are the regent of a small tribe. You start out with nothing bu [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -# Fix wrong locations of some installed files (upstream bug) -# See also FS#72240 -mkdir -p %{buildroot}%{_bindir} -mv %{buildroot}%{_prefix}/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet} %{buildroot}%{_bindir} -mv %{buildroot}%{_prefix}/{VERSION,ChangeLog,CREDITS} %{buildroot}%{_datadir}/widelands -mv %{buildroot}/share/* %{buildroot}%{_datadir}/ -rm -f %{buildroot}%{_prefix}/COPYING +rm -f %{buildroot}%{_prefix}/{COPYING,CREDITS,ChangeLog,VERSION} %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -# For the next release -#%pre -# preparing system before update -#cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done -#Checkmate -#Dry Riverbed -#Elven Forests -#Enemy in sight -#Finlakes -#Firegames -#Four Castles -#Glacier Lake -#Golden Peninsula -#Lake of tranquility -#Plateau -#Riverlands -#The Oasis Triangle -#The big lake -#The long way -#Two frontiers -#War of the Valleys -#EOF - %files %defattr(-,root,root) %{_bindir}/widelands %{_bindir}/wl_create_spritesheet %{_bindir}/wl_map_info %{_bindir}/wl_map_object_info -%dir %{_datadir}/widelands -%{_datadir}/widelands/* %{_datadir}/applications/org.widelands.Widelands.desktop %{_datadir}/metainfo/org.widelands.Widelands.appdata.xml +%dir %{_datadir}/widelands +%{_datadir}/widelands/* %{_datadir}/icons/hicolor/*/apps/org.widelands.Widelands.png %{_mandir}/man6/widelands.6* %doc COPYING CREDITS -#ChangeLog %changelog +* Fri Feb 23 2024 Automatic Build System 1.1-1mamba +- automatic version update by autodist + * Fri Dec 31 2021 Silvan Calarco 1.0-1mamba - update to 1.0