Hello community, here is the log from the commit of package openttd for openSUSE:Factory checked in at 2018-05-29 10:34:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd (Old) and /work/SRC/openSUSE:Factory/.openttd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd" Tue May 29 10:34:28 2018 rev:37 rq:610770 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openttd/openttd.changes 2018-04-19 15:31:02.579230595 +0200 +++ /work/SRC/openSUSE:Factory/.openttd.new/openttd.changes 2018-05-29 10:34:43.755064086 +0200 @@ -1,0 +2,7 @@ +Fri May 18 17:47:44 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix compilation with ICU61 (#6690) + Add fix_issue6690_compilation_with_icu61.patch +- Use SOURCE_DATE_EPOCH as build date, instead of "openSUSE BuildService" + +------------------------------------------------------------------- New: ---- fix_issue6690_compilation_with_icu61.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd.spec ++++++ --- /var/tmp/diff_new_pack.4m3sS5/_old 2018-05-29 10:34:45.562997322 +0200 +++ /var/tmp/diff_new_pack.4m3sS5/_new 2018-05-29 10:34:45.562997322 +0200 @@ -24,10 +24,12 @@ Summary: A clone of Chris Sawyer's Transport Tycoon Deluxe License: GPL-2.0-only Group: Amusements/Games/Strategy/Other -URL: http://www.openttd.org +Url: http://www.openttd.org Source: http://binaries.openttd.org/releases/%{version}/%{name}-%{version}-source.tar.xz # PATCH-FEATURE-UPSTREAM https://bugs.openttd.org/task/6490 Source2: openttd.appdata.xml +# PATCH-FIX-UPSTREAM https://bugs.openttd.org/issues/6690 - fix compilation with ICU 61 +Patch0: https://github.com/OpenTTD/OpenTTD/commit/19076c24c1f3baf2a22d1fa832d5688216cf54a3.patch#/fix_issue6690_compilation_with_icu61.patch BuildRequires: SDL-devel BuildRequires: fdupes BuildRequires: gcc-c++ > 3.3 @@ -102,11 +104,10 @@ %prep %setup -q +%patch0 -p1 # Remove build time references so build-compare can do its work -sed -i "s/__DATE__/\"openSUSE\"/" src/rev.cpp.in -sed -i "s/__TIME__/\"BuildService\"/" src/rev.cpp.in -sed -i "s/!!DATE!!/openSUSE Build Service/" src/rev.cpp.in +sed -i "s/__DATE__.*__TIME__/\"${SOURCE_DATE_EPOCH}\"/" src/rev.cpp.in %build # first, we build the dedicated binary and copy it to dedicated/ ++++++ fix_issue6690_compilation_with_icu61.patch ++++++ >From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 From: Charles Pigott <charlespig...@googlemail.com> Date: Sun, 8 Apr 2018 01:06:18 +0100 Subject: [PATCH] Fix #6690: Compilation with ICU 61 --- src/language.h | 2 +- src/strings.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/language.h b/src/language.h index d33ba81892..ec241dbd8c 100644 --- a/src/language.h +++ b/src/language.h @@ -105,7 +105,7 @@ extern LanguageList _languages; 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); diff --git a/src/strings.cpp b/src/strings.cpp index 1c539d9343..fd7420259a 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang 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. @@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) /* 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. */
