<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96ae7f034c52f4b277aef71040497d94039d7dd8">https://github.com/macports/macports-ports/commit/96ae7f034c52f4b277aef71040497d94039d7dd8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 96ae7f034c52f4b277aef71040497d94039d7dd8
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Nov 4 10:24:16 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-1.0: minor fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Add the compiler_blacklist_versions PortGroup.
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix the port being used for wxWidgets-3.2.
</span><span style='display:block; white-space:pre;color:#404040;'> * Move the libc++ settings to the PortGroup.
</span>---
_resources/port1.0/group/wxWidgets-1.0.tcl | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/wxWidgets-1.0.tcl b/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 640c30e..4c03810 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/wxWidgets-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,6 +138,8 @@
</span> # If you switch to a different version of wxWidgets it would also be
# sufficient to change one single line line with 'wxWidgets.use <name>'.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> options wxWidgets.name
options wxWidgets.port
options wxWidgets.version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,6 +255,11 @@ proc wxWidgets._set {option action args} {
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # ugly workaround to allow some C++11-only applications to be built on < 10.9
} elseif {${args} eq "wxWidgets-3.0-cxx11"} {
global cxx_stdlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,6 +277,8 @@ proc wxWidgets._set {option action args} {
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this doesn't work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PortGroup cxx11 1.1
</span> # temporary development version of wxWidgets 3.0.x
} elseif {${args} eq "wxWidgets-3.0-devel"} {
wxWidgets.name "wxWidgets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,7 +294,7 @@ proc wxWidgets._set {option action args} {
</span> } elseif {${args} eq "wxWidgets-3.2"} {
wxWidgets.name "wxWidgets"
wxWidgets.version "3.1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.port "wxWidgets-3.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.port "wxWidgets-3.2"
</span> if {${os.major} < 11} {
pre-fetch {
ui_error "${wxWidgets.port} requires macOS 10.7 or later."
</pre><pre style='margin:0'>
</pre>