[packages/widelands] - added icu patch, release 3 (rebuild with icu 64)

qboosh qboosh at pld-linux.org
Sat Apr 13 14:34:15 CEST 2019


commit 80903f6c128a3a06564b0353b2fd8a19cd87280a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 13 14:34:20 2019 +0200

    - added icu patch, release 3 (rebuild with icu 64)

 widelands-icu.patch | 11 +++++++++++
 widelands.spec      |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/widelands.spec b/widelands.spec
index 00f1f36..65e3be2 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -7,7 +7,7 @@ Summary:	Game like Settlers II
 Summary(pl.UTF-8):	Remake gry Settlers II
 Name:		widelands
 Version:	0.build%{buildver}
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games
 #Source0Download: https://wl.widelands.org/wiki/Download/#release
@@ -16,6 +16,7 @@ Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+downl
 Source1:	%{name}.desktop
 Patch0:		%{name}-pld.patch
 Patch1:		gcc8.patch
+Patch2:		%{name}-icu.patch
 URL:		https://wl.widelands.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL2-devel >= 2
@@ -76,6 +77,7 @@ Remake gry Settlers II - pliki danych.
 %setup -q -n %{name}-build%{buildver}-src
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/widelands-icu.patch b/widelands-icu.patch
new file mode 100644
index 0000000..22b7a27
--- /dev/null
+++ b/widelands-icu.patch
@@ -0,0 +1,11 @@
+--- widelands-build19-src/src/graphic/text/bidi.h.orig	2016-11-10 08:28:01.000000000 +0100
++++ widelands-build19-src/src/graphic/text/bidi.h	2019-04-13 14:11:05.664106041 +0200
+@@ -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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/80903f6c128a3a06564b0353b2fd8a19cd87280a



More information about the pld-cvs-commit mailing list