<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/77f5abdb41a7eb8d16345210b7f0c5487bdbc9fe">https://github.com/macports/macports-ports/commit/77f5abdb41a7eb8d16345210b7f0c5487bdbc9fe</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 77f5abdb41a7eb8d16345210b7f0c5487bdbc9fe
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Mon Oct 28 16:50:20 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.2: update version to 3.1.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - bump version to 3.1.3
</span><span style='display:block; white-space:pre;color:#404040;'> - c++11 as default
</span><span style='display:block; white-space:pre;color:#404040;'> - many fixes for various controls appearance in high DPI
</span><span style='display:block; white-space:pre;color:#404040;'> - platforms (macOS 10.14+) support.
</span><span style='display:block; white-space:pre;color:#404040;'> - Important bug fixes for focus handling in wxOSX port.
</span>---
graphics/wxWidgets-3.2/Portfile | 42 +++++-------
.../wxWidgets-3.2/files/fix-datatransfer_h.patch | 74 ++++++++++++++++++++++
graphics/wxWidgets-3.2/files/patch-configure.diff | 53 ----------------
3 files changed, 90 insertions(+), 79 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/Portfile b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c685709..ec2e09b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,8 @@ PortGroup github 1.0
</span> PortGroup select 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Instead of backports a huge number of patches to support the newer macOS versions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# simply fetch a newer version from git (master) until 3.1.1 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a development port anyway and generally not used as dependency.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wxWidgets wxWidgets 3.1.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remember to bump version of wxWidgets-common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wxWidgets wxWidgets 3.1.3 v
</span> name wxWidgets-3.2
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +25,9 @@ long_description wxWidgets ${branch} is an open-source cross-platform C++ \
</span>
homepage http://www.wxwidgets.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f359c3c076d872b70d49055b5b86eaec7f1750c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 79bdda90d672b098d37f2dcb494d2a62e9c95d94a8f7aaed60e245716a5eba8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20111698
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 93c37f2dd0078bbbed2c0261f1e168c1e7fd0d4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 30cd9b244f95521d5b008e346ee1277734fae92ce0dc73c5eef36ca0fa1eb420 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20442994
</span>
dist_subdir wxWidgets/${version}
worksrcdir ${distname}/build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +37,9 @@ set selectdir ${workpath}/select
</span> select.group wxWidgets
select.file ${selectdir}/${subport}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:jpeg \
port:tiff \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,11 +50,9 @@ depends_lib-append port:jpeg \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fix-datatransfer_h.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> file mkdir ${selectdir}
system "echo \"${wxWidgets.wxdir}/wx-config\n${wxWidgets.wxdir}/wxrc-${branch}\" > ${select.file}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +74,8 @@ configure.args --prefix=${wxWidgets.prefix} \
</span> --enable-graphics_ctx \
--with-macosx-sdk=no \
--with-macosx-version-min=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-compat30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-compat30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-cxx11
</span>
if { ${os.platform} eq "darwin" && ${os.major} == 11 } {
# https://trac.macports.org/ticket/58040
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,6 +85,11 @@ if { ${os.platform} eq "darwin" && ${os.major} == 11 } {
</span> --with-macosx-version-min=${macosx_deployment_target}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # during the test period we could afford to disable compatibility to 3.0
# to detect the problems earlier
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,20 +100,6 @@ variant compat30 description {enable wxWidgets 3.0 compatibility (will become de
</span> --enable-compat30
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# notes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-unicode (already default)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-cxx11 (figure out how to use this switch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -stdlib=${configure.cxx_stdlib}
</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;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # TODO: --disable-precomp-headers should hopefully no longer be needed (try building wxGTK with universal)
# in both 3.0 branch and master
variant universal {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/files/fix-datatransfer_h.patch b/graphics/wxWidgets-3.2/files/fix-datatransfer_h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0235851
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.2/files/fix-datatransfer_h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 294c8a6b23de686436a36f076de6a004a110a4d1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Stefan Csomor <csomor@advancedconcepts.ch>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 5 Nov 2019 19:20:51 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] moving datatransfer.h to source files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+former place in private.h broke Audacity builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/wx/osx/private.h | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/osx/carbon/clipbrd.cpp | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/osx/carbon/dataobj.cpp | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/osx/cocoa/dnd.mm | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/osx/cocoa/window.mm | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a49a4166f84..23fd0025fbc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/wx/osx/private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/wx/osx/private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _WX_PRIVATE_OSX_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/core/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "wx/osx/private/datatransfer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if wxOSX_USE_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/iphone/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6012d3747ef..6c463d0d999 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osx/carbon/clipbrd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osx/carbon/clipbrd.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/scopedarray.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "wx/osx/private/datatransfer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define wxUSE_DATAOBJ 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61e37b7e2b1..2dbf820461a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osx/carbon/dataobj.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osx/carbon/dataobj.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/filename.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "wx/osx/private/datatransfer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CFStringRef kUTTypeTraditionalMacText = CFSTR("com.apple.traditional-mac-plain-text");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6ff71f619de..019d2adb18d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osx/cocoa/dnd.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osx/cocoa/dnd.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/evtloop.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "wx/osx/private/datatransfer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxOSXDataSinkItem::~wxOSXDataSinkItem()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8a8a12b948f..a589187a8e0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osx/cocoa/window.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osx/cocoa/window.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __WXMAC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private/available.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "wx/osx/private/datatransfer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/evtloop.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/files/patch-configure.diff b/graphics/wxWidgets-3.2/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a60aa7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch is needed for GTK to make sure that the port finds the right OpenGL library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19465,48 +19465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</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;'>--SEARCH_INCLUDE="\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include/X11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11R7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11R6/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include/X11R7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include/X11R6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/Motif-2.1/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/Motif-1.2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/Motif1.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/dt/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/openwin/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/Xm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R6/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R6.4/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/X11R7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/X11R6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/X11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/XFree86/include/X11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/pkg/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X1R5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include/X11R5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/X11R5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11R4/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include/X11R4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R4/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include/X11R4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/openwin/share/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SEARCH_INCLUDE="@@PREFIX@@/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for libraries directories... " >&6; }
</span></pre><pre style='margin:0'>
</pre>