From bfd2ba4891b567a00b40b7532349ff5431d7881d9d70499c41b83681d0724d90 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 12 Oct 2021 14:20:22 +0000 Subject: [PATCH] Accepting request 924821 from home:cgiboudeaux:branches:games - Add upstream patch to fix build on Tumbleweed: * 316eaea20975436.patch OBS-URL: https://build.opensuse.org/request/show/924821 OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=60 --- 316eaea20975436.patch | 21 +++++++++++++++++++++ widelands.changes | 6 ++++++ widelands.spec | 5 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 316eaea20975436.patch diff --git a/316eaea20975436.patch b/316eaea20975436.patch new file mode 100644 index 0000000..f652a5e --- /dev/null +++ b/316eaea20975436.patch @@ -0,0 +1,21 @@ +From 316eaea209754368a57f445ea4dd016ecf8eded6 Mon Sep 17 00:00:00 2001 +From: matthiakl +Date: Sat, 14 Aug 2021 19:24:08 +0200 +Subject: [PATCH] Added missing direct incude (#5025) + +--- + src/network/bufferedconnection.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/bufferedconnection.h b/src/network/bufferedconnection.h +index fe974b9ea54..7e1ecf87e4d 100644 +--- a/src/network/bufferedconnection.h ++++ b/src/network/bufferedconnection.h +@@ -20,6 +20,7 @@ + #ifndef WL_NETWORK_BUFFEREDCONNECTION_H + #define WL_NETWORK_BUFFEREDCONNECTION_H + ++#include + #include + #include + #include diff --git a/widelands.changes b/widelands.changes index e785d3b..23c0c88 100644 --- a/widelands.changes +++ b/widelands.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 12 09:19:25 UTC 2021 - Christophe Giboudeaux + +- Add upstream patch to fix build on Tumbleweed: + * 316eaea20975436.patch + ------------------------------------------------------------------- Sun Aug 22 10:56:56 UTC 2021 - Jan Engelhardt diff --git a/widelands.spec b/widelands.spec index 544f59f..843c32e 100644 --- a/widelands.spec +++ b/widelands.spec @@ -23,6 +23,8 @@ 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 +# PATCH-FIX-UPSTREAM -- add missing 'map' include +Patch0: 316eaea20975436.patch BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -83,7 +85,8 @@ Additional debugging data for Widelands. This package is not needed for normal operation. %prep -%setup -q +%autosetup -p1 + sed -i '/wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")/d' CMakeLists.txt sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFiles)\)/\1bin\2/' cmake/WlFunctions.cmake sed -i 's#../share#share#g' xdg/CMakeLists.txt