[112436] trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff

[mojca at macports.org]

Revision: 112436
          https://trac.macports.org/changeset/112436
Author:   mojca at macports.org
Date:     2013-10-23 02:33:38 -0700 (Wed, 23 Oct 2013)
Log Message:
-----------
wxWidgets-3.0: additional upstream patch/revert for 10.5 (#40842)

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff	2013-10-23 06:12:41 UTC (rev 112435)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff	2013-10-23 09:33:38 UTC (rev 112436)
@@ -2,6 +2,7 @@
 http://trac.wxwidgets.org/changeset/75024
 http://trac.wxwidgets.org/changeset/75025
 http://trac.wxwidgets.org/changeset/75028
+http://trac.wxwidgets.org/changeset/75035
 http://trac.wxwidgets.org/changeset/75050
 
 --- include/wx/fontutil.h
@@ -2358,7 +2359,7 @@
              case NSURLErrorBadURL:
              case NSURLErrorFileIsDirectory:
                  *out = wxWEBVIEW_NAV_ERR_REQUEST;
-@@ -1098,20 +1093,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
+@@ -1098,11 +1093,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                  *out = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                  break;
  
@@ -2370,15 +2371,6 @@
              case NSURLErrorBadServerResponse:
                  *out = wxWEBVIEW_NAV_ERR_REQUEST;
                  break;
- 
-             case NSURLErrorUserAuthenticationRequired:
-             case NSURLErrorSecureConnectionFailed:
--#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-             case NSURLErrorClientCertificateRequired:
--#endif
-                 *out = wxWEBVIEW_NAV_ERR_AUTH;
-                 break;
- 
 --- src/unix/dlunix.cpp
 +++ src/unix/dlunix.cpp
 @@ -64,171 +64,6 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131023/3b766a99/attachment.html>