<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b9d7da5ed9e4e552f0dea400632dce87a61526d2">https://github.com/macports/macports-ports/commit/b9d7da5ed9e4e552f0dea400632dce87a61526d2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b9d7da5ed9e openttd: update to 1.10.2
</span>b9d7da5ed9e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b9d7da5ed9e4e552f0dea400632dce87a61526d2
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Fri Jun 5 21:04:52 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> openttd: update to 1.10.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ...and remove dependency on ICU, made redundant some time ago
</span>---
games/openttd/Portfile | 21 +++++++--------------
games/openttd/files/patch-name_conflict.diff | 24 ------------------------
2 files changed, 7 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/Portfile b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bf87b20958..da518fd1668 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,12 +12,12 @@ maintainers {cal @neverpanic} openmaintainer
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.10.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d5549e42fc8c79af68f22c4bb5660724e4d6d588 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6741548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a821312b74f7328e367fa765b59ec228d8ebfb7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 939c55d259fb13cb47dfb3244e8f7b9e2f723883ebb2119410d8a282724eb6f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6766904
</span>
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,20 +41,13 @@ if {${name} eq ${subport}} {
</span> port:libpng \
port:freetype \
port:fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu-le-hb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu-lx \
</span> port:libiconv
depends_run port:openttd-opengfx \
port:openttd-opensfx \
port:openttd-openmsx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # icu-lx has a preprocessor define of INITIAL_CAPACITY in layout/RunArrays.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # icu has a variable INITIAL_CAPACITY in unicode/uniset.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ensure that unicode/uniset.h is included after layout/RunArrays.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-name_conflict.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lto.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-lto.diff \
</span> patch-sysroot.diff
# claims only 2011 needed, but actually is using more recent features.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +67,7 @@ if {${name} eq ${subport}} {
</span> --with-png \
--with-freetype \
--with-fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-icu \
</span> --enable-lto \
--enable-strip
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-name_conflict.diff b/games/openttd/files/patch-name_conflict.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 103331bab33..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-name_conflict.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/string.cpp.orig 2020-04-13 21:02:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/string.cpp 2020-05-09 22:43:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,10 +31,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "os/windows/string_uniscribe.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(WITH_COCOA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "os/macosx/string_osx.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WITH_ICU_I18N
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Required by strnatcmp. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unicode/ustring.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +38,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gfx_func.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* WITH_ICU_I18N */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(WITH_COCOA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "os/macosx/string_osx.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The function vsnprintf is used internally to perform the required formatting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * tasks. As such this one must be allowed, and makes sure it's terminated. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "safeguards.h"
</span></pre><pre style='margin:0'>
</pre>