update to build 20

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=47
This commit is contained in:
Dirk Stoecker 2019-07-10 17:55:15 +00:00 committed by Git OBS Bridge
parent 240d46a646
commit cb047c2e28
5 changed files with 17 additions and 30 deletions

View File

@ -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);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e511f9d26828a2b71b64cdfc6674e6e847543b2da73961ab882acca36c7c01a6
size 181609391

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38594d98c74f357d4c31dd8ee2b056bfe921f42935935af915d11b792677bcb2
size 232364340

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
- 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 <guillaume.gardet@opensuse.org>

View File

@ -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