From cb047c2e280ecd9c110a353050b84f698b2b179baab1ea4bc46b8865a725b356 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 10 Jul 2019 17:55:15 +0000 Subject: [PATCH 1/3] update to build 20 OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=47 --- widelands-build19-fix-build-icu.patch | 13 ------------- widelands-build19-src.tar.bz2 | 3 --- widelands-build20.tar.bz2 | 3 +++ widelands.changes | 7 +++++++ widelands.spec | 21 +++++++-------------- 5 files changed, 17 insertions(+), 30 deletions(-) delete mode 100644 widelands-build19-fix-build-icu.patch delete mode 100644 widelands-build19-src.tar.bz2 create mode 100644 widelands-build20.tar.bz2 diff --git a/widelands-build19-fix-build-icu.patch b/widelands-build19-fix-build-icu.patch deleted file mode 100644 index e58673a..0000000 --- a/widelands-build19-fix-build-icu.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'src/graphic/text/bidi.h' ---- src/graphic/text/bidi.h 2017-01-25 18:55:59 +0000 -+++ src/graphic/text/bidi.h 2018-04-02 14:32:46 +0000 -@@ -40,7 +40,7 @@ - // True if a string contains a character from the script's code blocks - bool has_script_character(const char* input, UI::FontSets::Selector script); - UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets); --std::string icustring2string(const UnicodeString& convertme); -+std::string icustring2string(const icu::UnicodeString& convertme); - std::string icuchar2string(const UChar& convertme); - bool cannot_start_line(const UChar& c); - bool cannot_end_line(const UChar& c); - diff --git a/widelands-build19-src.tar.bz2 b/widelands-build19-src.tar.bz2 deleted file mode 100644 index d2a20d6..0000000 --- a/widelands-build19-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e511f9d26828a2b71b64cdfc6674e6e847543b2da73961ab882acca36c7c01a6 -size 181609391 diff --git a/widelands-build20.tar.bz2 b/widelands-build20.tar.bz2 new file mode 100644 index 0000000..2d41e75 --- /dev/null +++ b/widelands-build20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38594d98c74f357d4c31dd8ee2b056bfe921f42935935af915d11b792677bcb2 +size 232364340 diff --git a/widelands.changes b/widelands.changes index 03769af..42a437c 100644 --- a/widelands.changes +++ b/widelands.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker + +- update to build 20 + Changelog see https://www.widelands.org/changelog/ + Drop patch widelands-build19-fix-build-icu.patch (included upstream) + ------------------------------------------------------------------- Tue Oct 9 08:25:07 UTC 2018 - Guillaume GARDET diff --git a/widelands.spec b/widelands.spec index 611a0fc..3153d3c 100644 --- a/widelands.spec +++ b/widelands.spec @@ -1,7 +1,7 @@ # # spec file for package widelands # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: widelands -Version: build19 +Version: build20 Release: 0 Summary: Realtime strategy game involving map control License: GPL-2.0-or-later Group: Amusements/Games/Strategy/Other Url: http://www.widelands.org -Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}-src.tar.bz2 -# PATCH-FIX-UPSTREAM widelands-build19-fix-build-icu.patch -- https://bugs.launchpad.net/widelands/+bug/1760581 -Patch0: widelands-build19-fix-build-icu.patch +Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.bz2 BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -37,16 +35,12 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: glew-devel +BuildRequires: graphviz-gnome BuildRequires: hicolor-icon-theme -# use more specific boost dependencies where possible to avoid redundant -# dependencies (boo#1062802) -%if 0%{?suse_version} >= 1330 BuildRequires: libboost_headers-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -87,8 +81,7 @@ Additional debugging data for Widelands. This package is not needed for normal operation. %prep -%setup -q -n %{name}-%{version}-src -%patch0 +%setup -q 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 @@ -114,7 +107,7 @@ for i in 16 32 48 64 128; do install -D -m 0644 data/images/logos/wl-ico-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done -install -D -m 0644 debian/widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -D -m 0644 debian/org.widelands.widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{name} -r Game StrategyGame desktop-file-edit --set-icon=%{name} %{buildroot}%{_datadir}/applications/%{name}.desktop From 9e64bc305d8e87206c2c85e330f9fe5c2e4b3f4baea1da4ea42676117cfb28e5 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 10 Jul 2019 18:03:02 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=48 --- widelands.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/widelands.spec b/widelands.spec index 3153d3c..5876cbd 100644 --- a/widelands.spec +++ b/widelands.spec @@ -47,6 +47,7 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: lua51-devel BuildRequires: ninja +BuildRequires: openSUSE-release BuildRequires: optipng BuildRequires: python-devel BuildRequires: update-desktop-files From 276d31da9ac4e7165cae3ce3d99977bbaa54decd18554921e695b66d536c1530 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 10 Jul 2019 20:01:32 +0000 Subject: [PATCH 3/3] fix Tumbleweed OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=49 --- build20-libGL.patch | 12 ++++++++++++ widelands.changes | 1 + widelands.spec | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 build20-libGL.patch diff --git a/build20-libGL.patch b/build20-libGL.patch new file mode 100644 index 0000000..47c1275 --- /dev/null +++ b/build20-libGL.patch @@ -0,0 +1,12 @@ +diff -ur widelands-build20/CMakeLists.txt widelands-build20_fix/CMakeLists.txt +--- widelands-build20/CMakeLists.txt 2019-05-02 07:23:39.000000000 +0200 ++++ widelands-build20_fix/CMakeLists.txt 2019-07-10 21:43:46.945029296 +0200 +@@ -181,7 +181,7 @@ + + # This is set to avoid linker errors when using GLVND-libs on Linux + if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") +- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") ++ link_libraries("GL") + add_compile_definitions(WL_USE_GLVND) + message(STATUS "Adding linker flags for GLVND.") + endif() diff --git a/widelands.changes b/widelands.changes index 42a437c..ad743c1 100644 --- a/widelands.changes +++ b/widelands.changes @@ -4,6 +4,7 @@ Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker - update to build 20 Changelog see https://www.widelands.org/changelog/ Drop patch widelands-build19-fix-build-icu.patch (included upstream) + Add build20-libGL.patch to fix build order ------------------------------------------------------------------- Tue Oct 9 08:25:07 UTC 2018 - Guillaume GARDET diff --git a/widelands.spec b/widelands.spec index 5876cbd..9df73f0 100644 --- a/widelands.spec +++ b/widelands.spec @@ -24,6 +24,8 @@ License: GPL-2.0-or-later Group: Amusements/Games/Strategy/Other Url: http://www.widelands.org Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM properly add -lGL as library for correct argument order +Patch1: build20-libGL.patch BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -83,6 +85,7 @@ operation. %prep %setup -q +%patch1 -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