<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/f3ed70a1c867bf748d57cec9bcc44bd417c3fc7f">https://github.com/macports/macports-ports/commit/f3ed70a1c867bf748d57cec9bcc44bd417c3fc7f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f3ed70a1c867bf748d57cec9bcc44bd417c3fc7f
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Mar 19 11:19:19 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.0-libcxx: delete port
</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/55221
</span>---
_resources/port1.0/group/wxWidgets-1.0.tcl | 46 ++++--------------------------
graphics/wxWidgets-3.0/Portfile | 5 ----
2 files changed, 6 insertions(+), 45 deletions(-)
<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 4c03810..9b8c7d6 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;'>@@ -45,17 +45,12 @@
</span> # that GTK != Mac, some programs work with wxGTK, but not with wxOSX.
# This could help you write proper patches and submit them upstream.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# * 'wxWidgets-3.0-libcxx'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# A workaround to make software written in C++11 (but without other C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependencies) work on macOS < 10.9. This is just wxWidgets 3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiled against libc++ even where libstdc++ is default. See also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * 'wxWidgets-3.0-cxx11'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# A workaround to make software written in C++11 work on macOS < 10.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is just wxWidgets 3.0 compiled against libc++ even where libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is default. See also
</span> # https://trac.macports.org/wiki/LibcxxOnOlderSystems
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# * 'wxWidgets-3.0-devel'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Tracking latest commits from the 3.0 branch for development purposes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (This variant will be removed at some point, so try not to rely on its
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# existence.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> # * 'wxWidgets-3.2'
# At the moment still mainly for development purposes, for testing ports
# for compatibility with wxWidgets 3.1/3.2.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,8 +171,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> ## - wxWidgets-3.0
## - wxGTK-3.0
## - wxPython-3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## - wxWidgets-3.0-libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## - wxWidgets-3.0-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## - wxWidgets-3.0-cxx11
</span> ## - wxWidgets-3.2
proc wxWidgets._set {option action args} {
global prefix frameworks_dir os.major
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,25 +239,9 @@ proc wxWidgets._set {option action args} {
</span> }
}
# ugly workaround to allow some C++11-only applications to be built on < 10.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${args} eq "wxWidgets-3.0-libcxx"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.name "wxWidgets"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.version "3.0-libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.port "wxWidgets-3.0-libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${wxWidgets.port} requires macOS 10.5 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</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;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ugly workaround to allow some C++11-only applications to be built on < 10.9
</span> } elseif {${args} eq "wxWidgets-3.0-cxx11"} {
global cxx_stdlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.name "wxWidgets"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.name "wxWidgets"
</span> if {${cxx_stdlib} eq "libstdc++"} {
wxWidgets.version "3.0-cxx11"
wxWidgets.port "wxWidgets-3.0-cxx11"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,17 +257,6 @@ proc wxWidgets._set {option action args} {
</span> }
# this doesn't work
# PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary development version of wxWidgets 3.0.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${args} eq "wxWidgets-3.0-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.name "wxWidgets"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.version "3.0-devel"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.port "wxWidgets-3.0-devel"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${wxWidgets.port} requires macOS 10.5 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> # preliminary support for wxWidgets 3.1/3.2
} elseif {${args} eq "wxWidgets-3.2"} {
wxWidgets.name "wxWidgets"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,7 +271,6 @@ proc wxWidgets._set {option action args} {
</span> } else {
# throw an error
ui_error "invalid parameter for wxWidgets.use; use one of:\n\twxWidgets-2.8/wxGTK-2.8/wxWidgets-3.0/wxGTK-3.0/wxPython-3.0/wxWidgets-3.2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # wxWidgets-3.0-libcxx, wxWidgets-3.0-devel
</span> return -code return "invalid parameter for wxWidgets.use"
}
wxWidgets.prefix ${frameworks_dir}/wxWidgets.framework/Versions/${wxWidgets.name}/${wxWidgets.version}
<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 b5ea1fc..81a8b4b 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;'>@@ -11,8 +11,6 @@ github.tarball_from releases
</span>
name wxWidgets-3.0
# ugly workaround to allow some C++11-only applications to be built on < 10.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport wxWidgets-3.0-libcxx {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ugly workaround to allow some C++11-only applications to be built on < 10.9
</span> subport wxWidgets-3.0-cxx11 {}
# for cases when wxPython gets out of sync with wxWidgets releases
subport wxPython-3.0 {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +25,6 @@ set wxtype osx_cocoa
</span>
if {${subport} eq ${name}} {
wxWidgets.use wxWidgets-3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${subport} eq "wxWidgets-3.0-libcxx"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ugly workaround to allow some C++11-only applications to be built on < 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.0-libcxx
</span> } elseif {${subport} eq "wxWidgets-3.0-cxx11"} {
# ugly workaround to allow some C++11-only applications to be built on < 10.9
wxWidgets.use wxWidgets-3.0-cxx11
</pre><pre style='margin:0'>
</pre>