Hello community, here is the log from the commit of package widelands for openSUSE:Factory checked in at 2018-06-20 15:30:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/widelands (Old) and /work/SRC/openSUSE:Factory/.widelands.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "widelands" Wed Jun 20 15:30:50 2018 rev:3 rq:617602 version:build19 Changes: -------- --- /work/SRC/openSUSE:Factory/widelands/widelands.changes 2017-10-18 10:51:13.990758910 +0200 +++ /work/SRC/openSUSE:Factory/.widelands.new/widelands.changes 2018-06-20 15:32:16.352083078 +0200 @@ -1,0 +2,8 @@ +Mon Jun 18 05:46:38 UTC 2018 - [email protected] + +- Fix build on Tumbleweed (boo#1097928, lp#1760581): + * Add widelands-build19-fix-build-icu.patch (picked from + upstream). +- Modernize spec file. + +------------------------------------------------------------------- New: ---- widelands-build19-fix-build-icu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ widelands.spec ++++++ --- /var/tmp/diff_new_pack.k2dedz/_old 2018-06-20 15:32:19.611964801 +0200 +++ /var/tmp/diff_new_pack.k2dedz/_new 2018-06-20 15:32:19.615964655 +0200 @@ -1,7 +1,7 @@ # # spec file for package widelands # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,10 +20,12 @@ Version: build19 Release: 0 Summary: Realtime strategy game involving map control -License: GPL-2.0+ +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 BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -49,17 +51,12 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: lua51-devel BuildRequires: ninja BuildRequires: optipng BuildRequires: python-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1220 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif Requires: %{name}-data = %{version} %description @@ -76,9 +73,7 @@ Summary: Data files for Widelands Group: Amusements/Games/Strategy/Other Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description data Data files for Widelands. Includes localization, maps graphics and music. @@ -93,12 +88,12 @@ %prep %setup -q -n %{name}-%{version}-src -# +%patch0 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 %build -%{__mkdir_p} build/locale +mkdir -p build/locale %define __builder ninja %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -137,6 +132,7 @@ # instead do post-install test PATH=%{buildroot}%{_bindir}:$PATH widelands --help | grep 'This is Widelands' +%if 0%{?suse_version} < 1330 %post %desktop_database_post %icon_theme_cache_post @@ -144,10 +140,11 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root,-) -%doc COPYING CREDITS ChangeLog +%license COPYING +%doc CREDITS ChangeLog %{_bindir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/%{name}.desktop @@ -155,7 +152,6 @@ %{_datadir}/appdata/widelands.appdata.xml %files data -f %{name}.lang -%defattr(-,root,root,-) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/locale %dir %{_datadir}/%{name}/locale/* @@ -163,7 +159,6 @@ %{_datadir}/%{name}/[^l]* %files debug -%defattr(-,root,root,-) %{_bindir}/wl_* %changelog ++++++ widelands-build19-fix-build-icu.patch ++++++ === 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);
