1 |
commit: 411d6e9248ea22a72d1291969c17fd32a2de527f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 16 09:07:34 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 09:08:10 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411d6e92 |
7 |
|
8 |
games-simulation/openttd: Bump to version 1.8.0. Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
11 |
|
12 |
games-simulation/openttd/Manifest | 2 +- |
13 |
.../openttd/files/openttd-1.8.0-icu61.patch | 45 ++++++++++++++++++++++ |
14 |
...enttd-1.8.0_rc1.ebuild => openttd-1.8.0.ebuild} | 22 ++++++----- |
15 |
3 files changed, 58 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest |
18 |
index 5bcc9a0a188..0830de1214c 100644 |
19 |
--- a/games-simulation/openttd/Manifest |
20 |
+++ b/games-simulation/openttd/Manifest |
21 |
@@ -1,3 +1,3 @@ |
22 |
DIST openttd-1.7.1-source.tar.gz 10090311 BLAKE2B 339171cd2895398ee1fedcfd24d1126fbc060b6d4530b267310b3f220448f8e6469a726e71e9882bea117585ea7b9f7271205f576ee2b26de6dec079f57f1620 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3 |
23 |
DIST openttd-1.7.2-source.tar.gz 10097175 BLAKE2B a027b6ca6d3116dc3e6ad6ae43965682107268e367032418200cf1c1e16c5b5dad39c275ea57d923f17564d80cceb0e9909dc5aaf7ee230242f0ce0f46f06b1a SHA512 44d25061c42cb9c81baa67a40ff31a6681dcbb121c61db74c5179a31f189919471a82b7fd3f79c2cdeef02af5b47ec35fdbdc7feed74ca2360c028869fe772e8 |
24 |
-DIST openttd-1.8.0-RC1-source.tar.xz 6520976 BLAKE2B 17d34378ba3aa7a9def9f3ff764c42b890a646946211184660c3af9e252b9a809d481ccdd31421442efd9c7fac86f5c9c6091987070d53d1c913d3ef680f413c SHA512 aff6833934ce875320bdba3410be15a53fc8c233e7efe60628158636eed3b179fea5c8e9f8af2181c16bc173c409eab93477f2165d448100d048959bf63ba3d2 |
25 |
+DIST openttd-1.8.0-source.tar.xz 6521016 BLAKE2B b3a608fd21d21f861af6eba235c028a59f071ab4698cfdcdd499b6ea7ece853679b064935368d95330414a24ac90aaa3c426afc12a2e135d5b0a48170879b807 SHA512 a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a |
26 |
|
27 |
diff --git a/games-simulation/openttd/files/openttd-1.8.0-icu61.patch b/games-simulation/openttd/files/openttd-1.8.0-icu61.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..e4143d82f67 |
30 |
--- /dev/null |
31 |
+++ b/games-simulation/openttd/files/openttd-1.8.0-icu61.patch |
32 |
@@ -0,0 +1,45 @@ |
33 |
+From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 |
34 |
+From: Charles Pigott <charlespigott@××××××××××.com> |
35 |
+Date: Sun, 8 Apr 2018 01:06:18 +0100 |
36 |
+Subject: [PATCH] Fix #6690: Compilation with ICU 61 |
37 |
+ |
38 |
+--- |
39 |
+ src/language.h | 2 +- |
40 |
+ src/strings.cpp | 4 ++-- |
41 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
42 |
+ |
43 |
+diff --git a/src/language.h b/src/language.h |
44 |
+index d33ba81892..ec241dbd8c 100644 |
45 |
+--- a/src/language.h |
46 |
++++ b/src/language.h |
47 |
+@@ -105,7 +105,7 @@ extern LanguageList _languages; |
48 |
+ extern const LanguageMetadata *_current_language; |
49 |
+ |
50 |
+ #ifdef WITH_ICU_SORT |
51 |
+-extern Collator *_current_collator; |
52 |
++extern icu::Collator *_current_collator; |
53 |
+ #endif /* WITH_ICU_SORT */ |
54 |
+ |
55 |
+ bool ReadLanguagePack(const LanguageMetadata *lang); |
56 |
+diff --git a/src/strings.cpp b/src/strings.cpp |
57 |
+index 1c539d9343..fd7420259a 100644 |
58 |
+--- a/src/strings.cpp |
59 |
++++ b/src/strings.cpp |
60 |
+@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang |
61 |
+ TextDirection _current_text_dir; ///< Text direction of the currently selected language. |
62 |
+ |
63 |
+ #ifdef WITH_ICU_SORT |
64 |
+-Collator *_current_collator = NULL; ///< Collator for the language currently in use. |
65 |
++icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. |
66 |
+ #endif /* WITH_ICU_SORT */ |
67 |
+ |
68 |
+ static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. |
69 |
+@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) |
70 |
+ |
71 |
+ /* Create a collator instance for our current locale. */ |
72 |
+ UErrorCode status = U_ZERO_ERROR; |
73 |
+- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); |
74 |
++ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); |
75 |
+ /* Sort number substrings by their numerical value. */ |
76 |
+ if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); |
77 |
+ /* Avoid using the collator if it is not correctly set. */ |
78 |
|
79 |
diff --git a/games-simulation/openttd/openttd-1.8.0_rc1.ebuild b/games-simulation/openttd/openttd-1.8.0.ebuild |
80 |
similarity index 92% |
81 |
rename from games-simulation/openttd/openttd-1.8.0_rc1.ebuild |
82 |
rename to games-simulation/openttd/openttd-1.8.0.ebuild |
83 |
index 6eca8d5fbef..2d97c8bf081 100644 |
84 |
--- a/games-simulation/openttd/openttd-1.8.0_rc1.ebuild |
85 |
+++ b/games-simulation/openttd/openttd-1.8.0.ebuild |
86 |
@@ -2,7 +2,7 @@ |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
EAPI=6 |
90 |
-inherit eutils gnome2-utils |
91 |
+inherit gnome2-utils |
92 |
|
93 |
MY_PV="${PV/_rc/-RC}" |
94 |
MY_P="${PN}-${MY_PV}" |
95 |
@@ -51,14 +51,20 @@ S="${WORKDIR}/${MY_P}" |
96 |
|
97 |
PATCHES=( |
98 |
"${FILESDIR}"/${PN}-1.6.0-cflags.patch |
99 |
+ "${FILESDIR}"/${PN}-1.8.0-icu61.patch |
100 |
) |
101 |
|
102 |
src_configure() { |
103 |
- local myopts=() |
104 |
+ local myopts=( |
105 |
+ $(use_with iconv) |
106 |
+ $(use_with png) |
107 |
+ $(use_with cpu_flags_x86_sse sse) |
108 |
+ $(use_with lzo liblzo2) |
109 |
+ ) |
110 |
# there is an allegro interface available as well as sdl, but |
111 |
# the configure for it looks broken so the sdl interface is |
112 |
# always built instead. |
113 |
- local myopts+=( --without-allegro ) |
114 |
+ myopts+=( --without-allegro ) |
115 |
|
116 |
# libtimidity not needed except for some embedded platform |
117 |
# nevertheless, it will be automagically linked if it is |
118 |
@@ -70,8 +76,8 @@ src_configure() { |
119 |
if use dedicated ; then |
120 |
myopts+=( --enable-dedicated ) |
121 |
else |
122 |
- use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' ) |
123 |
myopts+=( |
124 |
+ $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') |
125 |
$(use_with truetype freetype) |
126 |
$(use_with icu) |
127 |
--with-sdl |
128 |
@@ -92,10 +98,6 @@ src_configure() { |
129 |
--install-dir="${D}" \ |
130 |
--menu-group="Game;Simulation;" \ |
131 |
${myopts[@]} \ |
132 |
- $(use_with iconv) \ |
133 |
- $(use_with png) \ |
134 |
- $(use_with cpu_flags_x86_sse sse) \ |
135 |
- $(use_with lzo liblzo2) \ |
136 |
|| die |
137 |
} |
138 |
|
139 |
@@ -107,9 +109,9 @@ src_install() { |
140 |
default |
141 |
if use dedicated ; then |
142 |
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
143 |
- rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} |
144 |
+ rm -rf "${ED%/}"/usr/share/{applications,icons,pixmaps} |
145 |
fi |
146 |
- rm -f "${ED}"/usr/share/doc/${PF}/COPYING |
147 |
+ rm -f "${ED%/}"/usr/share/doc/${PF}/COPYING |
148 |
} |
149 |
|
150 |
pkg_preinst() { |