<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e04b5cdec2f5ca3daae7426428e2b0f40610f7a3">https://github.com/macports/macports-ports/commit/e04b5cdec2f5ca3daae7426428e2b0f40610f7a3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e04b5cd  qt5: remove unnecessary patch
</span>e04b5cd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e04b5cdec2f5ca3daae7426428e2b0f40610f7a3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 17 09:26:52 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5: remove unnecessary patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    On OSs older than 10.8 and when the openssl variant is not selected,
</span><span style='display:block; white-space:pre;color:#404040;'>    patch-qnetworkproxy_mac.cpp.diff allows the build process to
</span><span style='display:block; white-space:pre;color:#404040;'>    proceed farther than it would otherwise. Other, more serious
</span><span style='display:block; white-space:pre;color:#404040;'>    problems prevent it from running to completion, however.
</span>---
 aqua/qt5/Portfile                               |  5 -----
 aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff | 11 -----------
 2 files changed, 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index abac8b9..13b45e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -652,11 +652,6 @@ foreach {module module_info} [array get modules] {
</span>             # When testing, ensure that a universal object file is not inadvertently created.
             patchfiles-append patch-machtest.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # prior to 10.8, CFNetwork was part of CoreServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                patchfiles-append patch-qnetworkproxy_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff b/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84a54c3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qnetworkproxy_mac.cpp.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/network/kernel/qnetworkproxy_mac.cpp.orig  2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/network/kernel/qnetworkproxy_mac.cpp       2017-02-05 08:04:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef QT_NO_NETWORKPROXY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CFNetwork/CFNetwork.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <SystemConfiguration/SystemConfiguration.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>

</pre>