<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/aa11dab9d6fd8a85cadfab4958b4c5c15effdf65">https://github.com/macports/macports-ports/commit/aa11dab9d6fd8a85cadfab4958b4c5c15effdf65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa11dab9d6fd8a85cadfab4958b4c5c15effdf65
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Mar 19 10:42:05 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.0: update to 3.0.4
</span>---
graphics/wxWidgets-3.0/Portfile | 18 +++++++-----------
graphics/wxWidgets-3.0/files/patch-avkit-no32bit.diff | 11 -----------
graphics/wxWidgets-3.0/files/patch-configure.diff | 2 +-
graphics/wxWidgets-3.0/files/patch-gtk-quartz.diff | 2 +-
graphics/wxWidgets-3.0/files/patch-sdl.diff | 8 ++++----
5 files changed, 13 insertions(+), 28 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 012cced..b5ea1fc 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;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup select 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wxWidgets wxWidgets 3.0.3.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wxWidgets wxWidgets 3.0.4 v
</span> github.tarball_from releases
name wxWidgets-3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +70,9 @@ use_bzip2 yes
</span> distfiles ${distname}-${version}${extract.suffix}
checksums ${distname}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0dff106be96fc8f14e36531c16f1d69b0cae5003 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 179bcd489aec0a56a7a2890be68ee718b87a1c7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20204622
</span>
set selectdir ${workpath}/select
select.group wxWidgets
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,8 +88,7 @@ depends_lib port:jpeg \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-upstream-configure-highsierra.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +155,8 @@ if {${subport} eq "wxPython-3.0"} {
</span> rmd160 09280fd9ad1670162e38719e0055de5e6ddbc059 \
sha256 bc886064820ac90997e10623a591e26ee8b08d73711e8d6d0512eaaffb5e9362
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-upstream-src-osx-carbon-fontdlgosx.mm.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-upstream-configure-highsierra.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-upstream-src-osx-carbon-fontdlgosx.mm.diff \
</span> patch-upstream-src-stc-scintilla-src-Editor.cxx.diff \
patch-upstream-webkit-proper-types.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,11 +237,6 @@ if {${subport} eq "wxPython-3.0"} {
</span> # require_active_variants gtk3 x11
# }
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # AVKit is 64-bit only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/55269
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.wxwidgets.org/ticket/17991
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-avkit-no32bit.diff
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/files/patch-avkit-no32bit.diff b/graphics/wxWidgets-3.0/files/patch-avkit-no32bit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff4e1f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/files/patch-avkit-no32bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osx/cocoa/mediactrl.mm.orig 2017-05-15 13:54:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osx/cocoa/mediactrl.mm 2017-11-08 04:36:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if wxOSX_USE_AVFOUNDATION && wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if wxOSX_USE_AVFOUNDATION && wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 && defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define wxOSX_USE_AVKIT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define wxOSX_USE_AVKIT 0
</span><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 580add3..d848caf 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;'>-@@ -22036,48 +22036,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22047,48 +22047,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/files/patch-gtk-quartz.diff b/graphics/wxWidgets-3.0/files/patch-gtk-quartz.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d1105d..f4bc376 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/files/patch-gtk-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/files/patch-gtk-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@
</span> {
--- src/unix/mediactrl.cpp.orig
+++ src/unix/mediactrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,11 @@
</span>
#ifdef __WXGTK__
#include <gtk/gtk.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/files/patch-sdl.diff b/graphics/wxWidgets-3.0/files/patch-sdl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aa5689e..ff1a22c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/files/patch-sdl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/files/patch-sdl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ This patch is needed to make --with-sdl work
</span> http://trac.wxwidgets.org/ticket/15453
--- Makefile.in.orig
+++ Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6752,8 +6752,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6766,8 +6766,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
</span> @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ http://trac.wxwidgets.org/ticket/15453
</span> @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
@COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
@COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9006,8 +9006,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9021,8 +9021,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
</span> @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ http://trac.wxwidgets.org/ticket/15453
</span> COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13153,8 +13153,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13168,8 +13168,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
</span> @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ http://trac.wxwidgets.org/ticket/15453
</span> COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13466,8 +13466,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13481,8 +13481,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
</span> @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</pre><pre style='margin:0'>
</pre>