<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/75f44a33381d3571b5ca724b4efe837feef3b54a">https://github.com/macports/macports-ports/commit/75f44a33381d3571b5ca724b4efe837feef3b54a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 75f44a33381d3571b5ca724b4efe837feef3b54a
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Nov 4 10:30:08 2017 +0100

<span style='display:block; white-space:pre;color:#404040;'>    wxWidgets-3.0: fixes after upgrade to 3.0.3
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Update to version 3.0.3.1.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Fetch files from wxWidgets rather than from vadz.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Fix wxPython-3.0: properly revert to version 3.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>      and all the corresponding required patches
</span><span style='display:block; white-space:pre;color:#404040;'>      (accidentally broken during the upgrade to 3.0.3).
</span><span style='display:block; white-space:pre;color:#404040;'>    * The libc++ code and compiler blacklisting is now in the PortGroup.
</span><span style='display:block; white-space:pre;color:#404040;'>    * Fix livecheck.
</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/54296
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/54978
</span>---
 graphics/wxWidgets-3.0/Portfile                   | 91 ++++++++++-------------
 graphics/wxWidgets-3.0/files/patch-configure.diff |  2 +-
 2 files changed, 40 insertions(+), 53 deletions(-)

<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 b8231a6..beec6c8 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;'>@@ -2,12 +2,11 @@
</span> 
 PortSystem          1.0
 PortGroup           active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           github          1.0
</span> PortGroup           select          1.0
 PortGroup           wxWidgets       1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           compiler_blacklist_versions 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        vadz wxWidgets 3.0.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        wxWidgets wxWidgets 3.0.3.1 v
</span> github.tarball_from releases
 
 name                wxWidgets-3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,7 @@ subport             wxWidgets-3.0-cxx11 {}
</span> subport             wxPython-3.0 {}
 # build against GTK 3 
 subport             wxgtk-3.0 {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: fix dist_subdir at next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: fix dist_subdir and subset name at next release
</span> set wxpython_ver    3.0.2.0
 # when revbumping remember to change the revision also for wxPython-3.0
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,24 +60,19 @@ long_description    wxWidgets ${branch} is an open-source cross-platform C++ \
</span>                     GUI framework for Mac OS, Unix, Linux, Windows.
 
 homepage            http://www.wxwidgets.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname            wxWidgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://github.com/${installname}/${installname}/releases/download/v${version}/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sourceforge:project/wxwindows/${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    http://biolpc22.york.ac.uk/pub/${version}/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    http://trac.macports.org/raw-attachment/ticket/19190/:trac
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2           yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distfiles           ${distname}-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  a74969aba91793ce3c870ca966234b6f3cf74403 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove _1 at the end with the next proper version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            wxWidgets
</span> dist_subdir         wxWidgets/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir          ${distname}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir          ${distname}-${version}/build
</span> patch.dir           ${worksrcpath}/..
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2           yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles           ${distname}-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           ${distname}-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  0dff106be96fc8f14e36531c16f1d69b0cae5003 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set selectdir       ${workpath}/select
 select.group        wxWidgets
 select.file         ${selectdir}/${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,24 +89,6 @@ depends_run         port:wxWidgets-common \
</span> 
 patchfiles-append   patch-configure.diff \
                     patch-upstream-configure-highsierra.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#                    patch-upstream-src-osx-carbon-fontdlgosx.mm.diff 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                    patch-upstream-src-stc-scintilla-src-Editor.cxx.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                    patch-upstream-webkit-proper-types.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "wxWidgets-3.0-libcxx"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.blacklist-append   *gcc* {clang < 300}
</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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the following causes a crash on older versions of clang:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    #define wx_has_cpp11_include(h) __has_include(h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    #if wx_has_cpp11_include(<unordered_map>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/54296
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500}
</span> 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,20 +119,17 @@ if {[string match *clang* ${configure.cxx}]} {
</span>     configure.ldflags-append \
                     -stdlib=${configure.cxx_stdlib}
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/52069
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # The patch probably works on all OS X versions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # but I don't want to risk breaking anything
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                    patch-upstream-noquicktime.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # the sources should be patched,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # but this should work as a temporary workaround for Sierra users
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --disable-mediactrl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 if {${subport} eq "wxPython-3.0"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# drop _1 from the subset name on next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    master_sites            sourceforge:project/wxwindows/${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            http://biolpc22.york.ac.uk/pub/${version}/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            http://trac.macports.org/raw-attachment/ticket/19190/:trac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    use_bzip2               yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distfiles               ${distname}-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # drop _1 from the subset name on next update
</span>     set wxpythonsubset      wxPython-${wxpython_ver}_1-MacPorts-subset
     distfiles-append        ${wxpythonsubset}${extract.suffix}:trac
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,6 +146,22 @@ if {${subport} eq "wxPython-3.0"} {
</span>                             rmd160  09280fd9ad1670162e38719e0055de5e6ddbc059 \
                             sha256  bc886064820ac90997e10623a591e26ee8b08d73711e8d6d0512eaaffb5e9362
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-upstream-src-osx-carbon-fontdlgosx.mm.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-upstream-src-stc-scintilla-src-Editor.cxx.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-upstream-webkit-proper-types.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://trac.macports.org/ticket/52069
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.platform} eq "darwin" && ${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # The patch probably works on all OS X versions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # but I don't want to risk breaking anything
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-upstream-noquicktime.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # the sources should be patched,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # but this should work as a temporary workaround for Sierra users
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --disable-mediactrl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-destroot {
         # copy a subset of wxPython to wxWidgets to prevent a conflict
         # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,9 +259,8 @@ variant stdlib description {add support for various standard library features} {
</span> }
 
 if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.type  regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.url   ${homepage}/downloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex Release.*(3\\.0\\.\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    livecheck.url   https://api.github.com/repos/${github.author}/${github.project}/releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    livecheck.regex wxWidgets-(3\\.0\\.\[\\d\\.\]+)${extract.suffix}
</span> } else {
     livecheck.type  none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/files/patch-configure.diff b/graphics/wxWidgets-3.0/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aece6f6..580add3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> This patch is needed for GTK to make sure that the port finds the right OpenGL library
 --- configure.orig
 +++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21893,48 +21893,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22036,48 +22036,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span>  
  
  
</pre><pre style='margin:0'>

</pre>