<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99750106cb18d4d53ff563407eac16a114756708">https://github.com/macports/macports-ports/commit/99750106cb18d4d53ff563407eac16a114756708</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 9975010 openjk: fix build on 10.9
</span>9975010 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99750106cb18d4d53ff563407eac16a114756708
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Dec 16 10:40:52 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> openjk: fix build on 10.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> a fancy set of workarounds in openjk
</span><span style='display:block; white-space:pre;color:#404040;'> for an old version of gcc doesn't work
</span><span style='display:block; white-space:pre;color:#404040;'> out in 10.9, so just make the test
</span><span style='display:block; white-space:pre;color:#404040;'> fail unconditionally
</span>---
games/openjk/Portfile | 6 ++++++
games/openjk/files/patch-qplatform-max-align.diff | 11 +++++++++++
2 files changed, 17 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openjk/Portfile b/games/openjk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d02761..6f8b72c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openjk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openjk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,12 @@ patchfiles patch-code-rd-vanilla-gltext.diff \
</span> patch-cmakelists-archfix.diff \
patch-CMakeLists-Clang-ID.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# workaround a specific error on darwin 13 regarding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# a complex typedef spec in the openjk source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 13 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qplatform-max-align.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
move ${destroot}${prefix}/JediAcademy ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openjk/files/patch-qplatform-max-align.diff b/games/openjk/files/patch-qplatform-max-align.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..06689a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openjk/files/patch-qplatform-max-align.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./shared/qcommon/q_platform.h.orig 2017-12-16 10:27:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./shared/qcommon/q_platform.h 2017-12-16 10:30:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,7 +212,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // gcc versions < 4.9 did not add max_align_t to the std:: namespace, but instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // put it in the global namespace. Need this to provide uniform access to max_align_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #if defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef max_align_t qmax_align_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef std::max_align_t qmax_align_t;
</span></pre><pre style='margin:0'>
</pre>