<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/963e8f7ba330899e9fc0cd1313e0af6d7ae71198">https://github.com/macports/macports-ports/commit/963e8f7ba330899e9fc0cd1313e0af6d7ae71198</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 963e8f7ba330899e9fc0cd1313e0af6d7ae71198
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sun Aug 20 09:17:36 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.0-cxx11: new subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allows ports that require both wxWidgets 3.0 and C++11 to build on
</span><span style='display:block; white-space:pre;color:#404040;'> older systems.
</span>---
_resources/port1.0/group/wxWidgets-1.0.tcl | 17 +++++++++++++++++
graphics/wxWidgets-3.0/Portfile | 6 ++++++
2 files changed, 23 insertions(+)
<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 cf354d0..101ee56 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;'>@@ -251,6 +251,23 @@ proc wxWidgets._set {option action args} {
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ugly workaround to allow some C++11-only applications to be built on < 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${args} eq "wxWidgets-3.0-cxx11"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.name "wxWidgets"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.version "3.0-cxx11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.port "wxWidgets-3.0-cxx11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.version "3.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.port "wxWidgets-3.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${wxWidgets.port} requires macOS 10.5 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/Portfile b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cd353b..796dddc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wxWidgets-3.0
# ugly workaround to allow some C++11-only applications to be built on < 10.9
subport wxWidgets-3.0-libcxx {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ugly workaround to allow some C++11-only applications to be built on < 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport wxWidgets-3.0-cxx11 {}
</span> # for cases when wxPython gets out of sync with wxWidgets releases
subport wxPython-3.0 {}
# build against GTK 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +29,10 @@ if {${subport} eq ${name}} {
</span> } elseif {${subport} eq "wxWidgets-3.0-libcxx"} {
# ugly workaround to allow some C++11-only applications to be built on < 10.9
wxWidgets.use wxWidgets-3.0-libcxx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "wxWidgets-3.0-cxx11"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ugly workaround to allow some C++11-only applications to be built on < 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.1
</span> } elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 3.0.2
</pre><pre style='margin:0'>
</pre>