[packages/openttd] - release 3, rebuild againast icu 64

[adamg]

commit 08491086b786959b82a2e26a038c80c45880221b
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sat Apr 13 23:05:21 2019 +0200

    - release 3, rebuild againast icu 64

 openttd-icu64.patch | 31 +++++++++++++++++++++++++++++++
 openttd.spec        |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/openttd.spec b/openttd.spec
index 857397f..e9fc0a2 100644
--- a/openttd.spec
+++ b/openttd.spec
@@ -6,7 +6,7 @@ Summary:	An open source reimplementation of the Microprose game "Transport Tycoo
 Summary(pl.UTF-8):	Otwarta reimplementacja gry Transport Tycoon Deluxe
 Name:		openttd
 Version:	1.6.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://us.binaries.openttd.org/binaries/releases/%{version}/%{name}-%{version}-source.tar.xz
@@ -15,6 +15,7 @@ Source1:	%{name}.desktop
 Source2:	%{name}-server.desktop
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-libiconv.patch
+Patch2:		%{name}-icu64.patch
 URL:		http://www.openttd.org/
 BuildRequires:	SDL-devel
 BuildRequires:	fontconfig-devel
@@ -83,6 +84,7 @@ graficzny klient OpenTTD również zawiera taką funkcjonalność.
 %setup -q
 %{?with_home_etc:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 
 # Let's pldize
 find src/lang/ -type f -exec %{__sed} -i 's/:Unix/:PLD Linux/' \{\} \;
diff --git a/openttd-icu64.patch b/openttd-icu64.patch
new file mode 100644
index 0000000..931aacd
--- /dev/null
+++ b/openttd-icu64.patch
@@ -0,0 +1,31 @@
+--- openttd-1.6.1/src/language.h~	2019-04-13 22:53:25.090428421 +0200
++++ openttd-1.6.1/src/language.h	2019-04-13 22:46:25.201737686 +0200
+@@ -111,7 +111,7 @@
+ extern const LanguageMetadata *_current_language;
+ 
+ #ifdef WITH_ICU_SORT
+-extern Collator *_current_collator;
++extern icu::Collator *_current_collator;
+ #endif /* WITH_ICU_SORT */
+ 
+ bool ReadLanguagePack(const LanguageMetadata *lang);
+--- openttd-1.6.1/src/strings.cpp~	2019-04-13 22:53:26.100481421 +0200
++++ openttd-1.6.1/src/strings.cpp	2019-04-13 22:51:17.253720586 +0200
+@@ -52,7 +52,7 @@
+ TextDirection _current_text_dir; ///< Text direction of the currently selected language.
+ 
+ #ifdef WITH_ICU_SORT
+-Collator *_current_collator = NULL;               ///< Collator for the language currently in use.
++icu::Collator *_current_collator = NULL;               ///< Collator for the language currently in use.
+ #endif /* WITH_ICU_SORT */
+ 
+ static uint64 _global_string_params_data[20];     ///< Global array of string parameters. To access, use #SetDParam.
+@@ -1801,7 +1801,7 @@
+ 
+ 	/* Create a collator instance for our current locale. */
+ 	UErrorCode status = U_ZERO_ERROR;
+-	_current_collator = Collator::createInstance(Locale(_current_language->isocode), status);
++	_current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
+ 	/* Sort number substrings by their numerical value. */
+ 	if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
+ 	/* Avoid using the collator if it is not correctly set. */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openttd.git/commitdiff/08491086b786959b82a2e26a038c80c45880221b