[138534] trunk/dports/graphics/wxWidgets-3.0

mojca at macports.org mojca at macports.org
Sat Jul 11 07:09:51 PDT 2015


Revision: 138534
          https://trac.macports.org/changeset/138534
Author:   mojca at macports.org
Date:     2015-07-11 07:09:50 -0700 (Sat, 11 Jul 2015)
Log Message:
-----------
wxWidgets-3.0: upstream patch to support 10.10 and newer (closes #48317)

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/Portfile

Added Paths:
-----------
    trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-webkit-proper-types.diff

Removed Paths:
-------------
    trunk/dports/graphics/wxWidgets-3.0/files/patch-webview_webkit.mm.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2015-07-11 12:22:20 UTC (rev 138533)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2015-07-11 14:09:50 UTC (rev 138534)
@@ -11,7 +11,7 @@
 subport             wxPython-3.0 {}
 subport             wxgtk-3.0 {}
 version             3.0.2
-revision            2
+revision            3
 set wxpython_ver    3.0.2.0
 # when revbumping remember to change the revision also for wxPython-3.0
 
@@ -26,7 +26,7 @@
 } elseif {${subport} eq "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
     version         3.0.2
-    revision        3
+    revision        4
 } elseif {${subport} eq "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
     # wxgtk-3.0 is here mainly for testing purposes
@@ -89,14 +89,9 @@
 patch.dir           ${worksrcpath}/..
 
 patchfiles-append   patch-configure.diff \
-                    patch-upstream-src-osx-carbon-fontdlgosx.mm.diff
+                    patch-upstream-src-osx-carbon-fontdlgosx.mm.diff \
+                    patch-upstream-webkit-proper-types.diff
 
-# See #44524. This patch will likely be incorporated in WxWidgets 3.0.3?.
-# http://trac.wxwidgets.org/attachment/ticket/16329/wx_webview.patch
-platform darwin 14 {
-    patchfiles-append patch-webview_webkit.mm.diff
-}
-
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
 }

Added: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-webkit-proper-types.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-webkit-proper-types.diff	                        (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-webkit-proper-types.diff	2015-07-11 14:09:50 UTC (rev 138534)
@@ -0,0 +1,175 @@
+https://trac.macports.org/ticket/48317
+http://trac.wxwidgets.org/changeset/2a13ad64d85213846147c31f095e7b419487f677/git-wxWidgets
+
+Fix wxOSX build under 10.10.
+Use proper types for webkit variants.
+Closes http://trac.wxwidgets.org/ticket/16329.
+
+--- include/wx/defs.h.orig
++++ include/wx/defs.h
+@@ -3169,14 +3169,22 @@ enum wxUpdateUI
+ DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
+ DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
+ DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
++DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
+ 
+ typedef WX_UIWindow WXWindow;
+ typedef WX_UIView WXWidget;
+ typedef WX_EAGLContext WXGLContext;
+ typedef WX_NSString* WXGLPixelFormat;
++typedef WX_UIWebView OSXWebViewPtr;
+ 
+ #endif
+ 
++#if wxOSX_USE_COCOA_OR_CARBON
++DECLARE_WXCOCOA_OBJC_CLASS(WebView);
++typedef WX_WebView OSXWebViewPtr;
++#endif
++
++
+ #endif /* __WXMAC__ */
+ 
+ /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
+--- include/wx/html/webkit.h.orig
++++ include/wx/html/webkit.h
+@@ -18,7 +18,6 @@
+ #endif
+ 
+ #include "wx/control.h"
+-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
+ 
+ // ----------------------------------------------------------------------------
+ // Web Kit Control
+@@ -107,7 +106,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
+     wxString m_currentURL;
+     wxString m_pageTitle;
+ 
+-    WX_WebView m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
+--- include/wx/osx/webview_webkit.h.orig
++++ include/wx/osx/webview_webkit.h
+@@ -158,7 +158,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
+     wxWindowID m_windowID;
+     wxString m_pageTitle;
+ 
+-    wxObjCID m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
+--- src/osx/webview_webkit.mm.orig
++++ src/osx/webview_webkit.mm
+@@ -296,7 +296,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
+     wxWebViewWebKit* webKitWindow;
+ }
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow;
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
+ 
+ @end
+ 
+@@ -305,7 +305,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
+     wxWebViewWebKit* webKitWindow;
+ }
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow;
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
+ 
+ @end
+ 
+@@ -314,7 +314,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
+     wxWebViewWebKit* webKitWindow;
+ }
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow;
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
+ 
+ @end
+ 
+@@ -442,7 +442,7 @@ void wxWebViewWebKit::GoBack()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView goBack];
++    [m_webView goBack];
+ }
+ 
+ void wxWebViewWebKit::GoForward()
+@@ -450,7 +450,7 @@ void wxWebViewWebKit::GoForward()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView goForward];
++    [m_webView goForward];
+ }
+ 
+ void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
+@@ -849,7 +849,7 @@ void wxWebViewWebKit::Cut()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView cut:m_webView];
++    [m_webView cut:m_webView];
+ }
+ 
+ void wxWebViewWebKit::Copy()
+@@ -857,7 +857,7 @@ void wxWebViewWebKit::Copy()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView copy:m_webView];
++    [m_webView copy:m_webView];
+ }
+ 
+ void wxWebViewWebKit::Paste()
+@@ -865,7 +865,7 @@ void wxWebViewWebKit::Paste()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView paste:m_webView];
++    [m_webView paste:m_webView];
+ }
+ 
+ void wxWebViewWebKit::DeleteSelection()
+@@ -873,7 +873,7 @@ void wxWebViewWebKit::DeleteSelection()
+     if ( !m_webView )
+         return;
+ 
+-    [(WebView*)m_webView deleteSelection];
++    [m_webView deleteSelection];
+ }
+ 
+ bool wxWebViewWebKit::HasSelection() const
+@@ -1007,7 +1007,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+ 
+ @implementation WebViewLoadDelegate
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
+ {
+     [super init];
+     webKitWindow = inWindow;    // non retained
+@@ -1197,7 +1197,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
+ 
+ @implementation WebViewPolicyDelegate
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
+ {
+     [super init];
+     webKitWindow = inWindow;    // non retained
+@@ -1335,7 +1335,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
+ 
+ @implementation WebViewUIDelegate
+ 
+-- initWithWxWindow: (wxWebViewWebKit*)inWindow
++- (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
+ {
+     [super init];
+     webKitWindow = inWindow;    // non retained
+-- 
+2.1.0.rc0
+

Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-webview_webkit.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-webview_webkit.mm.diff	2015-07-11 12:22:20 UTC (rev 138533)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-webview_webkit.mm.diff	2015-07-11 14:09:50 UTC (rev 138534)
@@ -1,11 +0,0 @@
---- src/osx/webview_webkit.mm.orig	2014-09-16 07:27:52.000000000 -0600
-+++ src/osx/webview_webkit.mm	2014-09-16 07:28:12.000000000 -0600
-@@ -28,7 +28,7 @@
- #include "wx/hashmap.h"
- #include "wx/filesys.h"
- 
--#include <WebKit/WebKit.h>
-+#include <WebKit/WebKitLegacy.h>
- #include <WebKit/HIWebView.h>
- #include <WebKit/CarbonUtils.h>
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150711/c420c34f/attachment.html>


More information about the macports-changes mailing list