<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/4c20832325b662ad22b1466f8513700a67672bae">https://github.com/macports/macports-ports/commit/4c20832325b662ad22b1466f8513700a67672bae</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 4c20832325b openttd: Update to 12.2
</span>4c20832325b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c20832325b662ad22b1466f8513700a67672bae
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Mon Sep 12 18:23:57 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> openttd: Update to 12.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/47378
</span>---
games/openttd/Portfile | 118 ++++++++-------------
games/openttd/files/patch-cmake-PackageBundle.diff | 14 +++
games/openttd/files/patch-lto.diff | 36 -------
games/openttd/files/patch-sysroot.diff | 24 -----
4 files changed, 56 insertions(+), 136 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 fa7bf03b584..9d470d129f7 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;'>@@ -11,13 +11,14 @@ maintainers {cal @neverpanic} openmaintainer
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.10.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 12.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 863de2742c84f198d44d02268575cd5233f1c56f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6815924
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 33e354a8bfca07e43837425e2559b9794933cc28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81508f0de93a0c264b216ef56a05f8381fff7bffa6d010121a21490b4dace95c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7377496
</span>
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,12 +29,13 @@ if {${name} eq ${subport}} {
</span> mimic the original game as closely as possible while extending it with new \
features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://www.openttd.org/en/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://www.openttd.org/
</span> master_sites https://cdn.openttd.org/openttd-releases/${version}
distfiles openttd-${version}-source.tar.xz
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:zlib \
port:lzo2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,50 +49,25 @@ if {${name} eq ${subport}} {
</span> port:openttd-opensfx \
port:openttd-openmsx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-lto.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sysroot.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-PackageBundle.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # claims only 2011 needed, but actually is using more recent features.
</span> compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_BUILD=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS_BUILD=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_BUILD=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --prefix-dir=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --install-dir=${destroot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-osx-sysroot=${configure.sdkroot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-liblzma \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-liblzo2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-icu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-lto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append VERBOSE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append VERBOSE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPTION_USE_ASSERTS=Off \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_PREFIX=${applications_dir}/OpenTTD.app/Contents/Resources/
</span>
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {Download stable \((\d+(\.\d+)+)\)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/bundle/man/openttd.6.gz ${destroot}/${prefix}/share/man/man6/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/bundle/OpenTTD.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
subport openttd-opengfx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6ef0cbd399b3a4e117a70e723c072ed694b7517f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3551230
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2fec54ccdd6dad5e5f1917e581cde5c075824fa3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3547160
</span>
supported_archs noarch
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,33 +84,26 @@ subport openttd-opengfx {
</span> worksrcdir opengfx-${version}
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for some reason, the opengfx-${version}-all.zip file contains a tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "tar xf opengfx-${version}.tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/opengfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/
</span> xinstall -d -m 755 ${target}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse file ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${file} ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/opengfx-${version}.tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${target}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://www.openttd.org/en/download-opengfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://www.openttd.org/downloads/opengfx-releases/latest
</span> livecheck.regex {Latest stable release in opengfx is (\d+(\.\d+)+),}
}
subport openttd-opensfx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.2.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 426b641b5a29556598d8a3033b4c4dc5b98630ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11359588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1e0296baeab666f20365b67876e507e4ed6589cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11566000
</span>
supported_archs noarch
# actually CC Sampling Plus 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,25 +124,23 @@ subport openttd-opensfx {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/opensfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/
</span> xinstall -d -m 755 ${target}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse file ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${file} ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/opensfx-${version}.tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${target}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://www.openttd.org/en/download-opensfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://www.openttd.org/downloads/opensfx-releases/latest
</span> livecheck.regex {Latest stable release in opensfx is (\d+(\.\d+)+),}
}
subport openttd-openmsx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8eff246e89e44f63ca480e9acef94a1da5fa81d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 136981
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9079e1942b9fb19ddc31a313a7d86e50d1aac772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 140204
</span>
supported_archs noarch
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,15 +160,13 @@ subport openttd-openmsx {
</span> use_configure no
build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/openmsx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set target ${destroot}${applications_dir}/OpenTTD.app/Contents/Resources/baseset/
</span> xinstall -d -m 755 ${target}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse file ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${file} ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/openmsx-${version}.tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${target}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://www.openttd.org/en/download-openmsx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://www.openttd.org/downloads/openmsx-releases/latest
</span> livecheck.regex {Latest stable release in openmsx is (\d+(\.\d+)+),}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-cmake-PackageBundle.diff b/games/openttd/files/patch-cmake-PackageBundle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c1d13e61b88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/files/patch-cmake-PackageBundle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add DESTDIR support to fixup_bundle() call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./cmake/PackageBundle.cmake.orig 2022-09-12 18:06:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./cmake/PackageBundle.cmake 2022-09-12 18:06:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(BundleUtilities)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BU_CHMOD_BUNDLE_ITEMS TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/openttd\" \"\" \"\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fixup_bundle(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/../MacOS/openttd\" \"\" \"\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT Runtime)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-lto.diff b/games/openttd/files/patch-lto.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2deefb151ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-lto.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d7e7c639157385a47280553c474dfee9f32fb9af Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 3 Jun 2020 18:26:27 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add: support Clang LTO in configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.lib | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git config.lib config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 287c596233..e9c389726f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -667,7 +667,8 @@ check_params() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$enable_lto" != "0" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- has_lto=`($cxx_build -dumpspecs 2>&1 | grep '\%{flto') || ($cxx_build -help ipo 2>&1 | grep '\-ipo')`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Clang outputs -flto=thin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ has_lto=`($cxx_build -dumpspecs 2>&1 | grep '\%{flto') || ($cxx_build -help ipo 2>&1 | grep '\-ipo') || ($cxx_build --help 2>&1 | grep 'lto.*thin')`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$has_lto" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log 1 "using link time optimization... yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1336,6 +1337,12 @@ make_compiler_cflags() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # rdynamic is used to get useful stack traces from crash reports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ldflags="$ldflags -rdynamic"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "$enable_lto" != "0" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags="$flags -flto=thin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ features="$features lto"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ features_host="$features_host lto"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume gcc, since it just uses argv[0] in its --version output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable some things only for certain GCC versions
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-sysroot.diff b/games/openttd/files/patch-sysroot.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2c9b1d604ca..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-sysroot.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;'>-From a6ef620b751c736794e4ad95dac091a6d34c72ad Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 3 Jun 2020 18:50:13 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix: unbreak setting sysroot/SDK on recent versions of macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The 10.15 SDK cannot target 10.4 due to missing libstdc++ headers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.lib | 3 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git config.lib config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e9c389726f..64f6724f5c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2111,8 +2111,7 @@ check_osx_sdk() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Set minimum version to 10.4 as that's when kCGBitmapByteOrder32Host was introduced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysroot="-isysroot $osx_sdk_path -Wl,-syslibroot,$osx_sdk_path -mmacosx-version-min=10.4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot="-isysroot $osx_sdk_path -Wl,-syslibroot,$osx_sdk_path"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat > tmp.osx.mm << EOF
</span></pre><pre style='margin:0'>
</pre>