Your message dated Sat, 17 Nov 2018 21:00:34 +0000 with message-id <e1go7hi-0001ox...@fasolo.debian.org> and subject line Bug#913509: fixed in openttd 1.8.0-2 has caused the Debian Bug report #913509, regarding openttd FTBFS with ICU 63.1 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 913509: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913509 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Source: openttd Source-Version: 1.8.0-1 Severity: important Tags: patch Usertags: icu63 Dear Maintainer, ICU 63.1 recently released, packaged and uploaded to experimental. Its transition is going to start soon. However your package fails to build with this version. I attach a patch which fixes the problem. Please check if it works with the version in Sid and upload the package when it's feasible for you. Thanks, Laszlo/GCSDescription: fix FTBFS with ICU 63.1 Add icu namespace. Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> Last-Update: 2018-11-05 --- --- openttd-1.8.0.orig/src/gfx_layout.cpp +++ openttd-1.8.0/src/gfx_layout.cpp @@ -126,7 +126,7 @@ static size_t AppendToBuffer(UChar *buff * Wrapper for doing layouts with ICU. */ class ICUParagraphLayout : public AutoDeleteSmallVector<ParagraphLayouter::Line *, 4>, public ParagraphLayouter { - ParagraphLayout *p; ///< The actual ICU paragraph layout. + icu::ParagraphLayout *p; ///< The actual ICU paragraph layout. public: /** Helper for GetLayouter, to get the right type. */ typedef UChar CharType; @@ -135,10 +135,10 @@ public: /** Visual run contains data about the bit of text with the same font. */ class ICUVisualRun : public ParagraphLayouter::VisualRun { - const ParagraphLayout::VisualRun *vr; ///< The actual ICU vr. + const icu::ParagraphLayout::VisualRun *vr; ///< The actual ICU vr. public: - ICUVisualRun(const ParagraphLayout::VisualRun *vr) : vr(vr) { } + ICUVisualRun(const icu::ParagraphLayout::VisualRun *vr) : vr(vr) { } const Font *GetFont() const { return (const Font*)vr->getFont(); } int GetGlyphCount() const { return vr->getGlyphCount(); } @@ -150,10 +150,10 @@ public: /** A single line worth of VisualRuns. */ class ICULine : public AutoDeleteSmallVector<ICUVisualRun *, 4>, public ParagraphLayouter::Line { - ParagraphLayout::Line *l; ///< The actual ICU line. + icu::ParagraphLayout::Line *l; ///< The actual ICU line. public: - ICULine(ParagraphLayout::Line *l) : l(l) + ICULine(icu::ParagraphLayout::Line *l) : l(l) { for (int i = 0; i < l->countRuns(); i++) { *this->Append() = new ICUVisualRun(l->getVisualRun(i)); @@ -173,13 +173,13 @@ public: } }; - ICUParagraphLayout(ParagraphLayout *p) : p(p) { } + ICUParagraphLayout(icu::ParagraphLayout *p) : p(p) { } ~ICUParagraphLayout() { delete p; } void Reflow() { p->reflow(); } ParagraphLayouter::Line *NextLine(int max_width) { - ParagraphLayout::Line *l = p->nextLine(max_width); + icu::ParagraphLayout::Line *l = p->nextLine(max_width); return l == NULL ? NULL : new ICULine(l); } }; @@ -196,7 +196,7 @@ static ParagraphLayouter *GetParagraphLa } /* Fill ICU's FontRuns with the right data. */ - FontRuns runs(fontMapping.Length()); + icu::FontRuns runs(fontMapping.Length()); for (FontMap::iterator iter = fontMapping.Begin(); iter != fontMapping.End(); iter++) { runs.add(iter->second, iter->first); } @@ -204,7 +204,7 @@ static ParagraphLayouter *GetParagraphLa LEErrorCode status = LE_NO_ERROR; /* ParagraphLayout does not copy "buff", so it must stay valid. * "runs" is copied according to the ICU source, but the documentation does not specify anything, so this might break somewhen. */ - ParagraphLayout *p = new ParagraphLayout(buff, length, &runs, NULL, NULL, NULL, _current_text_dir == TD_RTL ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR, false, status); + icu::ParagraphLayout *p = new icu::ParagraphLayout(buff, length, &runs, NULL, NULL, NULL, _current_text_dir == TD_RTL ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR, false, status); if (status != LE_NO_ERROR) { delete p; return NULL; --- openttd-1.8.0.orig/src/gfx_layout.h +++ openttd-1.8.0/src/gfx_layout.h @@ -21,7 +21,7 @@ #ifdef WITH_ICU_LAYOUT #include "layout/ParagraphLayout.h" -#define ICU_FONTINSTANCE : public LEFontInstance +#define ICU_FONTINSTANCE : public icu::LEFontInstance #else /* WITH_ICU_LAYOUT */ #define ICU_FONTINSTANCE #endif /* WITH_ICU_LAYOUT */ --- openttd-1.8.0.orig/src/language.h +++ openttd-1.8.0/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); --- openttd-1.8.0.orig/src/strings.cpp +++ openttd-1.8.0/src/strings.cpp @@ -52,7 +52,7 @@ const LanguageMetadata *_current_languag 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 LanguageMeta /* 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. */
--- End Message ---
--- Begin Message ---Source: openttd Source-Version: 1.8.0-2 We believe that the bug you reported is fixed in the latest version of openttd, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 913...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Matthijs Kooijman <matth...@stdin.nl> (supplier of updated openttd package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sat, 17 Nov 2018 19:44:28 +0100 Source: openttd Binary: openttd openttd-data Architecture: source Version: 1.8.0-2 Distribution: unstable Urgency: medium Maintainer: Matthijs Kooijman <matth...@stdin.nl> Changed-By: Matthijs Kooijman <matth...@stdin.nl> Description: openttd - reimplementation of Transport Tycoon Deluxe with enhancements openttd-data - common data files for the OpenTTD game Closes: 897233 910990 913509 Changes: openttd (1.8.0-2) unstable; urgency=medium . * [6a1c164] Backport upstream changes to fix compilation with ICU 61 and above (Closes: #913509) * [4dd1430] Bump debhelper version to v11 * [ed01c93] Support DEB_BUILD_OPTIONS=terse * [c2e35e2] Bump standards version to 4.2.1 * [9b9605a] Stop using the ICU layout engine (Closes: #897233) * [d5bec9d] Fix cross-building: Supply --pkg-config to ./configure. Thanks to Helmut Grohne for the patch (Closes: #910990) Checksums-Sha1: ea29b193581e421622fc0db785a7254cd786079b 2136 openttd_1.8.0-2.dsc 34232f0a537c0ed7d88a599c63035fed4be4800a 14864 openttd_1.8.0-2.debian.tar.xz da0e3ab77b1c8635c820b258a4c4ba06c5a31556 11594 openttd_1.8.0-2_amd64.buildinfo Checksums-Sha256: 096d4cfe28bc735943cc055a012968b631c385b9c84487fe8e8b88ad19941eba 2136 openttd_1.8.0-2.dsc 32bd34e8ba72fa23de22cbb2e721e17fc313838daf3f41e8ca7dfa509de5c250 14864 openttd_1.8.0-2.debian.tar.xz 8d4bccee700af14574c0300e888e574091b968d70ab6bee64be2d9cd4b0be480 11594 openttd_1.8.0-2_amd64.buildinfo Files: 6fdc8aa3e83c9a95c15ebadb684410a1 2136 games optional openttd_1.8.0-2.dsc a84c8b3d7d1c7d02f4183075d7b07f5d 14864 games optional openttd_1.8.0-2.debian.tar.xz d397e7f29dd4577d621c3aae87087c93 11594 games optional openttd_1.8.0-2_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQJGBAEBCAAwFiEEMyF3AetYrDfGJ9el6ZMxy91tJYwFAlvweZQSHG1hdHRoaWpz QHN0ZGluLm5sAAoJEOmTMcvdbSWMJ6sQAMsX30FoVBOHwEVNsREy2babyE4+4sHE JkWVX/X3FO2At+qGunT8mjuk4LKiEE3C1xvGAVWnHDzx3bqDDSuIniuqyZDLk+z1 +61G5nTwZAwSjFC1+tYVciAe6kjhUKyadzUZ6684W8lseoU1TYJEhAfJQExLWyVz IFRYxJYEpKthY3Z3/MG2tZ9hXyFoeXMJIAcaVfW1k+ap0Dxi0gcGiJ6gMK5xtfTV cbGfFkzYLNA1vTzuNYmuqe1ItQTFblPjhy8BPz51s/1zMwtZ0PVR5JARBCo88Tjh jB/BfcygnZJKChSQYUg6CEJIIs/u1gOGYxmvOkbGOT6meCGX2ZGyXLL671qzxK1v 31APZclzwB9SYu/Zjnah/7MD021n9uFqmjYIKpU/CANI4XHiNQK82HyLtRAEWdOJ oBpkVmW0nqwJDbHwTVYlpGlaKKTqlX7mkAeAagy0TMjALGL4Pff626N+vlbvyL7H uUaYgjCmuIRXAs/qi8OUUNs/hsLeLczF+Z3b6CzC4S6Yjz3+V8vbxwn+mXOxGm/4 Sf1OOTac4XbQ/0krnzKeWjiu66fFowU1oL3BgGHp8pWoAY+YvNh8iUr7PSPfnISx td39IxQD3fG0jSXjm4yzc/bU+69+Yyvj+im+h7nabaF77BkFkKiOtuRvz2L8rLMT gJsdsnrTpvfH =V3fE -----END PGP SIGNATURE-----
--- End Message ---
