<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/585de1439c63a3fc6f20d094baf4a9c6eb1a8bb7">https://github.com/macports/macports-ports/commit/585de1439c63a3fc6f20d094baf4a9c6eb1a8bb7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 585de1439c63a3fc6f20d094baf4a9c6eb1a8bb7
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue May 28 23:59:54 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    plplot: fix wxwidgets variant
</span>---
 science/plplot/Portfile | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/Portfile b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3865bafaf11..d6554ef399d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup       wxWidgets 1.0
</span> 
 name            plplot
 version         5.15.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision        5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision        6
</span> platforms       darwin
 maintainers     {takeshi @tenomoto} openmaintainer
 categories      science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,15 +298,28 @@ variant qt4 description {Add support for Qt4} {
</span> }
 
 variant wxwidgets description {Add support for wxWidgets} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    wxWidgets.use           wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # It is needed to use C++ subports, otherwise build suceeds but binaries fail to launch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Fatal Error: Mismatch between the program and library build versions detected.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # The library used 3.0 (wchar_t,compiler with C++ ABI 1002,wx containers,compatible with 2.8),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # and your program used 3.0 (wchar_t,compiler with C++ ABI 1018,wx containers,compatible with 2.8).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Also, wxWidgets-3.0 does not work correctly on early macOS versions, use wxGTK there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.platform} eq "darwin" && ${os.major} > 10} {
</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;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        wxWidgets.use       wxGTK-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # FIXME: wxPLViewer may fail to launch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # wxPlViewerApp::OnInit: error when creating wxPlFrame instance
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Same error reported here: https://bugs.mageia.org/show_bug.cgi?id=29848#c60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # For now, use the old API:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DOLD_WXWIDGETS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     depends_lib-append      port:${wxWidgets.port}
     configure.args-delete   -DPLD_wxwidgets=OFF \
                             -DENABLE_wxwidgets=OFF
     configure.args-append   -DPLD_wxwidgets=ON \
                             -DENABLE_wxwidgets=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DwxWidgets_wxrc_EXECUTABLE=${wxWidgets.wxrc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -Dwxwidgets_LINK_FLAGS=-lplplotd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
</span> }
 
 # X11 notes: Tk binding fails in configure
</pre><pre style='margin:0'>

</pre>