openttd: updated to 1.8.0 1.8.0: (None) 1.8.0-RC1: - Feature: [GFX] Climate-specific Action5 extra airport sprites - Feature: Draw vertical separators at tile distance in the train depot GUI - Feature: [Build] MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled - Feature: [Build] Project file generator for kdevelop 4/5 - Feature: Add option to close windows with right click - Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list - Feature: Display aircraft type in vehicle preview/purchase/detail windows - Change: [NewGRF] Various performance improvements to resolving VA2 - Change: [NewGRF] Increase maximum allowed vehicle sprite size to reduce clipping of ships - Change: Check companies for bankruptcy before subtracting reoccuring monthly costs - Change: [GFX] Replace the office building sprite on various toyland airports with a better fitting sprite - Change: [GFX] The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version - Change: Reword texts in industry view, when stockpiling is used - Change: Remove the gap between windows when positioning them after opening - Change: [Build] Enable usage of static_assert for MSVC - Change: [Build] Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file - Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking - Change: Parse extmidi command string for parameters to pass on - Change: Draw images in centre of buttons - Fix: Store the map variety setting in the savegame like the other mapgen settings, so restarting maps considers it - Fix: Hair selection was missing one option - Fix: Avoid tile operations outside map border when building lock - Fix: Catenary sprites got mixed up for depots - Fix: Make automatic window-positioning RTL-aware - Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values - Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers - Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shared triggers - Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry - Fix: [NPF] Reserved track bits were not accounted for when trying to find any safe position - Fix: Do not modify argv[0] - Fix: Do not search directories when opening ini files as we already have their full path - Fix: Road tunnel/bridge heads have no trackbits wrt. catenary drawingdiff -r1.72 -r1.73 pkgsrc/games/openttd/Makefile
(adam)
@@ -1,62 +1,61 @@ | @@ -1,62 +1,61 @@ | |||
1 | # $NetBSD: Makefile,v 1.72 2018/04/14 07:34:22 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.73 2018/07/07 11:57:33 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= openttd-1.7.1-source | 3 | DISTNAME= openttd-1.8.0-source | |
4 | PKGNAME= ${DISTNAME:S/-source//} | 4 | PKGNAME= ${DISTNAME:S/-source//} | |
5 | PKGREVISION= 4 | |||
6 | CATEGORIES= games x11 | 5 | CATEGORIES= games x11 | |
7 | MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= http://binaries.openttd.org/releases/${PKGVERSION_NOREV}/ | |
8 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.openttd.org/ | 10 | HOMEPAGE= http://www.openttd.org/ | |
12 | COMMENT= Open source clone of Transport Tycoon Deluxe | 11 | COMMENT= Open source clone of Transport Tycoon Deluxe | |
13 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
14 | 13 | |||
15 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | 14 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | |
16 | USE_LANGUAGES= c c++0x | 15 | USE_LANGUAGES= c c++0x | |
17 | USE_TOOLS+= gmake pkg-config | 16 | USE_TOOLS+= gmake pkg-config | |
18 | BUILD_DEFS+= VARBASE | 17 | BUILD_DEFS+= VARBASE | |
19 | BUILD_TARGET= bundle | 18 | BUILD_TARGET= bundle | |
20 | 19 | |||
21 | HAS_CONFIGURE= yes | 20 | HAS_CONFIGURE= yes | |
22 | CONFIGURE_ARGS+= --prefix-dir=${PREFIX} | 21 | CONFIGURE_ARGS+= --prefix-dir=${PREFIX} | |
23 | CONFIGURE_ARGS+= --binary-dir=bin | 22 | CONFIGURE_ARGS+= --binary-dir=bin | |
24 | CONFIGURE_ARGS+= --data-dir=share/openttd | 23 | CONFIGURE_ARGS+= --data-dir=share/openttd | |
25 | CONFIGURE_ARGS+= --doc-dir=share/doc/openttd | 24 | CONFIGURE_ARGS+= --doc-dir=share/doc/openttd | |
26 | CONFIGURE_ARGS+= --icon-theme-dir=share/icons/hicolor | 25 | CONFIGURE_ARGS+= --icon-theme-dir=share/icons/hicolor | |
27 | CONFIGURE_ARGS+= --install-dir=${DESTDIR} | 26 | CONFIGURE_ARGS+= --install-dir=${DESTDIR} | |
28 | CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6 | 27 | CONFIGURE_ARGS+= --man-dir=${PKGMANDIR}/man6 | |
29 | CONFIGURE_ARGS+= --menu-dir=share/applications | 28 | CONFIGURE_ARGS+= --menu-dir=share/applications | |
30 | CONFIGURE_ARGS+= --personal-dir=.openttd | 29 | CONFIGURE_ARGS+= --personal-dir=.openttd | |
31 | CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd | 30 | CONFIGURE_ARGS+= --shared-dir=${VARBASE}/games/openttd | |
32 | # Hack: built-in xz does not provide liblzma.pc, needed to configure | 31 | # Hack: built-in xz does not provide liblzma.pc, needed to configure | |
33 | PREFER_PKGSRC+= xz | 32 | PREFER_PKGSRC+= xz | |
34 | 33 | |||
35 | CONFIGURE_ARGS+= --with-iconv | 34 | CONFIGURE_ARGS+= --with-iconv | |
36 | CONFIGURE_ARGS+= --with-lzo2=${BUILDLINK_PREFIX.lzo}/lib | 35 | CONFIGURE_ARGS+= --with-lzo2=${BUILDLINK_PREFIX.lzo}/lib | |
37 | 36 | |||
38 | .include "../../mk/bsd.prefs.mk" | 37 | .include "../../mk/bsd.prefs.mk" | |
39 | 38 | |||
40 | CONFIGURE_ARGS.DragonFly+= --os=FREEBSD | 39 | CONFIGURE_ARGS.DragonFly+= --os=FREEBSD | |
41 | 40 | |||
42 | .if ${OPSYS} == "Darwin" | 41 | .if ${OPSYS} == "Darwin" | |
43 | CONFIGURE_ARGS+= --disable-cocoa-quickdraw | 42 | CONFIGURE_ARGS+= --disable-cocoa-quickdraw | |
44 | CONFIGURE_ARGS+= --with-cocoa | 43 | CONFIGURE_ARGS+= --with-cocoa | |
45 | CONFIGURE_ARGS+= --without-application-bundle | 44 | CONFIGURE_ARGS+= --without-application-bundle | |
46 | CONFIGURE_ARGS+= --without-osx-sysroot | 45 | CONFIGURE_ARGS+= --without-osx-sysroot | |
47 | .else | 46 | .else | |
48 | .include "../../devel/SDL/buildlink3.mk" | 47 | .include "../../devel/SDL/buildlink3.mk" | |
49 | .endif | 48 | .endif | |
50 | 49 | |||
51 | .include "../../archivers/lzo/buildlink3.mk" | 50 | .include "../../archivers/lzo/buildlink3.mk" | |
52 | .include "../../archivers/xz/buildlink3.mk" | 51 | .include "../../archivers/xz/buildlink3.mk" | |
53 | .include "../../converters/libiconv/buildlink3.mk" | 52 | .include "../../converters/libiconv/buildlink3.mk" | |
54 | .include "../../devel/zlib/buildlink3.mk" | 53 | .include "../../devel/zlib/buildlink3.mk" | |
55 | .include "../../fonts/fontconfig/buildlink3.mk" | 54 | .include "../../fonts/fontconfig/buildlink3.mk" | |
56 | .include "../../graphics/freetype2/buildlink3.mk" | 55 | .include "../../graphics/freetype2/buildlink3.mk" | |
57 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 56 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
58 | .include "../../graphics/png/buildlink3.mk" | 57 | .include "../../graphics/png/buildlink3.mk" | |
59 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 58 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
60 | .include "../../textproc/icu/buildlink3.mk" | 59 | .include "../../textproc/icu/buildlink3.mk" | |
61 | .include "../../mk/pthread.buildlink3.mk" | 60 | .include "../../mk/pthread.buildlink3.mk" | |
62 | .include "../../mk/bsd.pkg.mk" | 61 | .include "../../mk/bsd.pkg.mk" |
@@ -1,107 +1,109 @@ | @@ -1,107 +1,109 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.23 2017/06/28 18:18:36 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.24 2018/07/07 11:57:33 adam Exp $ | |
2 | bin/openttd | 2 | bin/openttd | |
3 | man/man6/openttd.6 | 3 | man/man6/openttd.6 | |
4 | share/applications/openttd.desktop | 4 | share/applications/openttd.desktop | |
5 | share/doc/openttd/COPYING | 5 | share/doc/openttd/COPYING | |
6 | share/doc/openttd/changelog.txt | 6 | share/doc/openttd/changelog.txt | |
7 | share/doc/openttd/known-bugs.txt | 7 | share/doc/openttd/known-bugs.txt | |
8 | share/doc/openttd/multiplayer.txt | 8 | share/doc/openttd/multiplayer.txt | |
9 | share/doc/openttd/readme.txt | 9 | share/doc/openttd/readme.txt | |
10 | share/icons/hicolor/128x128/apps/openttd.png | 10 | share/icons/hicolor/128x128/apps/openttd.png | |
11 | share/icons/hicolor/16x16/apps/openttd.png | 11 | share/icons/hicolor/16x16/apps/openttd.png | |
12 | share/icons/hicolor/256x256/apps/openttd.png | 12 | share/icons/hicolor/256x256/apps/openttd.png | |
13 | share/icons/hicolor/32x32/apps/openttd.png | 13 | share/icons/hicolor/32x32/apps/openttd.png | |
14 | share/icons/hicolor/48x48/apps/openttd.png | 14 | share/icons/hicolor/48x48/apps/openttd.png | |
15 | share/icons/hicolor/64x64/apps/openttd.png | 15 | share/icons/hicolor/64x64/apps/openttd.png | |
16 | share/openttd/ai/compat_0.7.nut | 16 | share/openttd/ai/compat_0.7.nut | |
17 | share/openttd/ai/compat_1.0.nut | 17 | share/openttd/ai/compat_1.0.nut | |
18 | share/openttd/ai/compat_1.1.nut | 18 | share/openttd/ai/compat_1.1.nut | |
19 | share/openttd/ai/compat_1.2.nut | 19 | share/openttd/ai/compat_1.2.nut | |
20 | share/openttd/ai/compat_1.3.nut | 20 | share/openttd/ai/compat_1.3.nut | |
21 | share/openttd/ai/compat_1.4.nut | 21 | share/openttd/ai/compat_1.4.nut | |
22 | share/openttd/ai/compat_1.5.nut | 22 | share/openttd/ai/compat_1.5.nut | |
23 | share/openttd/ai/compat_1.6.nut | 23 | share/openttd/ai/compat_1.6.nut | |
24 | share/openttd/ai/compat_1.7.nut | 24 | share/openttd/ai/compat_1.7.nut | |
25 | share/openttd/ai/compat_1.8.nut | |||
25 | share/openttd/baseset/no_music.obm | 26 | share/openttd/baseset/no_music.obm | |
26 | share/openttd/baseset/no_sound.obs | 27 | share/openttd/baseset/no_sound.obs | |
27 | share/openttd/baseset/openttd.grf | 28 | share/openttd/baseset/openttd.grf | |
28 | share/openttd/baseset/opntitle.dat | 29 | share/openttd/baseset/opntitle.dat | |
29 | share/openttd/baseset/orig_dos.obg | 30 | share/openttd/baseset/orig_dos.obg | |
30 | share/openttd/baseset/orig_dos.obs | 31 | share/openttd/baseset/orig_dos.obs | |
31 | share/openttd/baseset/orig_dos_de.obg | 32 | share/openttd/baseset/orig_dos_de.obg | |
32 | share/openttd/baseset/orig_extra.grf | 33 | share/openttd/baseset/orig_extra.grf | |
33 | share/openttd/baseset/orig_win.obg | 34 | share/openttd/baseset/orig_win.obg | |
34 | share/openttd/baseset/orig_win.obm | 35 | share/openttd/baseset/orig_win.obm | |
35 | share/openttd/baseset/orig_win.obs | 36 | share/openttd/baseset/orig_win.obs | |
36 | share/openttd/game/compat_1.2.nut | 37 | share/openttd/game/compat_1.2.nut | |
37 | share/openttd/game/compat_1.3.nut | 38 | share/openttd/game/compat_1.3.nut | |
38 | share/openttd/game/compat_1.4.nut | 39 | share/openttd/game/compat_1.4.nut | |
39 | share/openttd/game/compat_1.5.nut | 40 | share/openttd/game/compat_1.5.nut | |
40 | share/openttd/game/compat_1.6.nut | 41 | share/openttd/game/compat_1.6.nut | |
41 | share/openttd/game/compat_1.7.nut | 42 | share/openttd/game/compat_1.7.nut | |
43 | share/openttd/game/compat_1.8.nut | |||
42 | share/openttd/lang/afrikaans.lng | 44 | share/openttd/lang/afrikaans.lng | |
43 | share/openttd/lang/arabic_egypt.lng | 45 | share/openttd/lang/arabic_egypt.lng | |
44 | share/openttd/lang/basque.lng | 46 | share/openttd/lang/basque.lng | |
45 | share/openttd/lang/belarusian.lng | 47 | share/openttd/lang/belarusian.lng | |
46 | share/openttd/lang/brazilian_portuguese.lng | 48 | share/openttd/lang/brazilian_portuguese.lng | |
47 | share/openttd/lang/bulgarian.lng | 49 | share/openttd/lang/bulgarian.lng | |
48 | share/openttd/lang/catalan.lng | 50 | share/openttd/lang/catalan.lng | |
49 | share/openttd/lang/croatian.lng | 51 | share/openttd/lang/croatian.lng | |
50 | share/openttd/lang/czech.lng | 52 | share/openttd/lang/czech.lng | |
51 | share/openttd/lang/danish.lng | 53 | share/openttd/lang/danish.lng | |
52 | share/openttd/lang/dutch.lng | 54 | share/openttd/lang/dutch.lng | |
53 | share/openttd/lang/english.lng | 55 | share/openttd/lang/english.lng | |
54 | share/openttd/lang/english_AU.lng | 56 | share/openttd/lang/english_AU.lng | |
55 | share/openttd/lang/english_US.lng | 57 | share/openttd/lang/english_US.lng | |
56 | share/openttd/lang/esperanto.lng | 58 | share/openttd/lang/esperanto.lng | |
57 | share/openttd/lang/estonian.lng | 59 | share/openttd/lang/estonian.lng | |
58 | share/openttd/lang/faroese.lng | 60 | share/openttd/lang/faroese.lng | |
59 | share/openttd/lang/finnish.lng | 61 | share/openttd/lang/finnish.lng | |
60 | share/openttd/lang/french.lng | 62 | share/openttd/lang/french.lng | |
61 | share/openttd/lang/gaelic.lng | 63 | share/openttd/lang/gaelic.lng | |
62 | share/openttd/lang/galician.lng | 64 | share/openttd/lang/galician.lng | |
63 | share/openttd/lang/german.lng | 65 | share/openttd/lang/german.lng | |
64 | share/openttd/lang/greek.lng | 66 | share/openttd/lang/greek.lng | |
65 | share/openttd/lang/hebrew.lng | 67 | share/openttd/lang/hebrew.lng | |
66 | share/openttd/lang/hungarian.lng | 68 | share/openttd/lang/hungarian.lng | |
67 | share/openttd/lang/icelandic.lng | 69 | share/openttd/lang/icelandic.lng | |
68 | share/openttd/lang/indonesian.lng | 70 | share/openttd/lang/indonesian.lng | |
69 | share/openttd/lang/irish.lng | 71 | share/openttd/lang/irish.lng | |
70 | share/openttd/lang/italian.lng | 72 | share/openttd/lang/italian.lng | |
71 | share/openttd/lang/japanese.lng | 73 | share/openttd/lang/japanese.lng | |
72 | share/openttd/lang/korean.lng | 74 | share/openttd/lang/korean.lng | |
73 | share/openttd/lang/latin.lng | 75 | share/openttd/lang/latin.lng | |
74 | share/openttd/lang/latvian.lng | 76 | share/openttd/lang/latvian.lng | |
75 | share/openttd/lang/lithuanian.lng | 77 | share/openttd/lang/lithuanian.lng | |
76 | share/openttd/lang/luxembourgish.lng | 78 | share/openttd/lang/luxembourgish.lng | |
77 | share/openttd/lang/malay.lng | 79 | share/openttd/lang/malay.lng | |
78 | share/openttd/lang/norwegian_bokmal.lng | 80 | share/openttd/lang/norwegian_bokmal.lng | |
79 | share/openttd/lang/norwegian_nynorsk.lng | 81 | share/openttd/lang/norwegian_nynorsk.lng | |
80 | share/openttd/lang/polish.lng | 82 | share/openttd/lang/polish.lng | |
81 | share/openttd/lang/portuguese.lng | 83 | share/openttd/lang/portuguese.lng | |
82 | share/openttd/lang/romanian.lng | 84 | share/openttd/lang/romanian.lng | |
83 | share/openttd/lang/russian.lng | 85 | share/openttd/lang/russian.lng | |
84 | share/openttd/lang/serbian.lng | 86 | share/openttd/lang/serbian.lng | |
85 | share/openttd/lang/simplified_chinese.lng | 87 | share/openttd/lang/simplified_chinese.lng | |
86 | share/openttd/lang/slovak.lng | 88 | share/openttd/lang/slovak.lng | |
87 | share/openttd/lang/slovenian.lng | 89 | share/openttd/lang/slovenian.lng | |
88 | share/openttd/lang/spanish.lng | 90 | share/openttd/lang/spanish.lng | |
89 | share/openttd/lang/spanish_MX.lng | 91 | share/openttd/lang/spanish_MX.lng | |
90 | share/openttd/lang/swedish.lng | 92 | share/openttd/lang/swedish.lng | |
91 | share/openttd/lang/tamil.lng | 93 | share/openttd/lang/tamil.lng | |
92 | share/openttd/lang/thai.lng | 94 | share/openttd/lang/thai.lng | |
93 | share/openttd/lang/traditional_chinese.lng | 95 | share/openttd/lang/traditional_chinese.lng | |
94 | share/openttd/lang/turkish.lng | 96 | share/openttd/lang/turkish.lng | |
95 | share/openttd/lang/ukrainian.lng | 97 | share/openttd/lang/ukrainian.lng | |
96 | share/openttd/lang/vietnamese.lng | 98 | share/openttd/lang/vietnamese.lng | |
97 | share/openttd/lang/welsh.lng | 99 | share/openttd/lang/welsh.lng | |
98 | share/openttd/scripts/autoexec.scr.example | 100 | share/openttd/scripts/autoexec.scr.example | |
99 | share/openttd/scripts/game_start.scr.example | 101 | share/openttd/scripts/game_start.scr.example | |
100 | share/openttd/scripts/on_client.scr.example | 102 | share/openttd/scripts/on_client.scr.example | |
101 | share/openttd/scripts/on_dedicated.scr.example | 103 | share/openttd/scripts/on_dedicated.scr.example | |
102 | share/openttd/scripts/on_server.scr.example | 104 | share/openttd/scripts/on_server.scr.example | |
103 | share/openttd/scripts/on_server_connect.scr.example | 105 | share/openttd/scripts/on_server_connect.scr.example | |
104 | share/openttd/scripts/pre_dedicated.scr.example | 106 | share/openttd/scripts/pre_dedicated.scr.example | |
105 | share/openttd/scripts/pre_server.scr.example | 107 | share/openttd/scripts/pre_server.scr.example | |
106 | share/openttd/scripts/readme.txt | 108 | share/openttd/scripts/readme.txt | |
107 | share/pixmaps/openttd.32.xpm | 109 | share/pixmaps/openttd.32.xpm |
@@ -1,8 +1,10 @@ | @@ -1,8 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.28 2017/06/28 18:18:36 adam Exp $ | 1 | $NetBSD: distinfo,v 1.29 2018/07/07 11:57:33 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (openttd-1.7.1-source.tar.xz) = a24a2a33cefd8d192fd4f6584f142a4b9d10338b | 3 | SHA1 (openttd-1.8.0-source.tar.xz) = fd6c90f04c4cbd626751acb9bf8a47a9f2b31520 | |
4 | RMD160 (openttd-1.7.1-source.tar.xz) = 7ed0fc3b1c62cdcc11093c3fe3945b7a8fd0f292 | 4 | RMD160 (openttd-1.8.0-source.tar.xz) = a607e955189561cc980dffc50dec57fc9ea9b9fb | |
5 | SHA512 (openttd-1.7.1-source.tar.xz) = ac3115538174801dc14f63065408e31ef9f60fe4a695d382bdccdd82c547d36e358c2109031289bd19114810a9db6add2662aa09e868ca40ea87ae500b7bca02 | 5 | SHA512 (openttd-1.8.0-source.tar.xz) = a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a | |
6 | Size (openttd-1.7.1-source.tar.xz) = 6517328 bytes | 6 | Size (openttd-1.8.0-source.tar.xz) = 6521016 bytes | |
7 | SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913 | 7 | SHA1 (patch-config.lib) = 4d3d7d9cc917163c728a51c17efa7f6b2e100913 | |
8 | SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1 | 8 | SHA1 (patch-src_core_alloc__func.hpp) = 17fcfe3ce984cd453f6756f4f212c8fe8ab15ed1 | |
9 | SHA1 (patch-src_language.h) = 162b798adb6a78172f2191633f44c7e59506f129 | |||
10 | SHA1 (patch-src_strings.cpp) = 75dd2a6672fa0b49ae724820f899f8b7f9260a56 |
$NetBSD: patch-src_language.h,v 1.1 2018/07/07 11:57:34 adam Exp $
Fix for ICU 61.
https://github.com/OpenTTD/OpenTTD/issues/6690
--- src/language.h.orig 2018-07-07 11:12:28.000000000 +0000
+++ 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);
$NetBSD: patch-src_strings.cpp,v 1.1 2018/07/07 11:57:34 adam Exp $
Fix for ICU 61.
https://github.com/OpenTTD/OpenTTD/issues/6690
--- src/strings.cpp.orig 2018-07-07 11:13:01.000000000 +0000
+++ 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. */