<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e4cc9c71db3ac1a15d8471e6954035cb36d7a04b">https://github.com/macports/macports-ports/commit/e4cc9c71db3ac1a15d8471e6954035cb36d7a04b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e4cc9c71db3ac1a15d8471e6954035cb36d7a04b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Oct 25 05:55:30 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: fix build for 10.15 SDK
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://bugreports.qt.io/browse/QTBUG-78997
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59386
</span>---
aqua/qt5/Portfile | 4 +
aqua/qt5/files/patch-qtwebengine_1015_sdk.diff | 199 +++++++++++++++++++++++++
2 files changed, 203 insertions(+)
<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 c6101f3..d08068f 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;'>@@ -1479,6 +1479,10 @@ foreach {module module_info} [array get modules] {
</span> # do not opportunistically find MacPorts libraries (e.g. X11 libraries)
patchfiles-append patch-qtwebengine_tests.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-78997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_1015_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.post_args-append \
-- \
-webengine-native-spellchecker \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff b/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f5ef738
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_1015_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,199 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From be2b74f4ab835573362a012047c76508973bd065 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 04 Oct 2019 11:25:07 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [Backport][ios] Get things compiling on Xcode 11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Updates various files with to conform to iOS13 SDK headers changes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Nullability and availability changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Updates security types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Updated default values (modalPresentationStyle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Updates objc_zombie with IMP changes (as well as adding the accidentally-omitted tests)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I949717fbe3823a7d867b2b854f05d52f20478ea6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commit-Queue: Justin Cohen <justincohen@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Mark Mentovai <mark@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Mark Cogan <marq@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: edchin <edchin@chromium.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Cr-Commit-Position: refs/heads/master@{#666142}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b2d56d8..8626046 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef BASE_MAC_FOUNDATION_UTIL_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BASE_MAC_FOUNDATION_UTIL_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned int NSSearchPathDomainMask;
</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;'>+-#if defined(OS_IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(OS_IOS) || defined(MAC_OS_X_VERSION_10_15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/chromium/components/crash/core/common/objc_zombie.mm b/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9af0cee..eced952 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/components/crash/core/common/objc_zombie.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t kBacktraceDepth = 20;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The original implementation for |-[NSObject dealloc]|.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IMP g_originalDeallocIMP = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OBJC_OLD_DISPATCH_PROTOTYPES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using RealIMP = IMP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// With !OBJC_OLD_DISPATCH_PROTOTYPES the runtime hasn't changed and IMP is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// still what it always was, but the SDK is hiding the details now outside the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// objc runtime. It is safe to define |RealIMP| to match the older definition of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// |IMP|.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using RealIMP = id (*)(id, SEL, ...);
</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;'>++RealIMP g_originalDeallocIMP = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Classes which freed objects become. |g_fatZombieSize| is the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // minimum object size which can be made into a fat zombie (which can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,8 +251,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Class rootClass = [NSObject class];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_originalDeallocIMP =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- class_getMethodImplementation(rootClass, @selector(dealloc));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_originalDeallocIMP = reinterpret_cast<RealIMP>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ class_getMethodImplementation(rootClass, @selector(dealloc)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // objc_getClass() so CrZombie doesn't need +class.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_zombieClass = objc_getClass("CrZombie");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_fatZombieClass = objc_getClass("CrFatZombie");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -335,9 +345,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const IMP prevDeallocIMP = method_setImplementation(m, (IMP)ZombieDealloc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const RealIMP prevDeallocIMP = reinterpret_cast<RealIMP>(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ method_setImplementation(m, reinterpret_cast<IMP>(ZombieDealloc)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DCHECK(prevDeallocIMP == g_originalDeallocIMP ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prevDeallocIMP == (IMP)ZombieDealloc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prevDeallocIMP == reinterpret_cast<RealIMP>(ZombieDealloc));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Grab the current set of zombies. This is thread-safe because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // only the main thread can change these.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,7 +420,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Put back the original implementation of -[NSObject dealloc].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Method m = class_getInstanceMethod([NSObject class], @selector(dealloc));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DCHECK(m);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- method_setImplementation(m, g_originalDeallocIMP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ method_setImplementation(m, reinterpret_cast<IMP>(g_originalDeallocIMP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Can safely grab this because it only happens on the main thread.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t oldCount = g_zombieCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3449634e50a8bc18b35aa28d06b17540cbb00ffe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 26 Sep 2019 12:57:40 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix use of deprecated method for scanning wifi networks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+scanForNetworksWithParameters has ben removed in the sdk that ships
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with XCode 11. Replace its use with scanForNetworksWithName.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The results should be the same.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: Ifaeb6b380d02364133280b44644ae8ca1e51119a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 1f1bd0af331476d46fe69ceb6df14b82f98cd54d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 278a538..1b53ce4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/services/device/geolocation/wifi_data_provider_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,10 +16,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "services/device/geolocation/wifi_data_provider_common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "services/device/geolocation/wifi_data_provider_manager.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" NSString* const kCWScanKeyMerge;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface CWInterface (Private)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- (NSArray*)scanForNetworksWithParameters:(NSDictionary*)params
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (NSSet<CWNetwork *> *)scanForNetworksWithName:(NSString *)networkName
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error:(NSError**)error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,9 +38,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base::mac::ScopedNSAutoreleasePool auto_pool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Initialize the scan parameters with scan key merging disabled, so we get
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // every AP listed in the scan without any SSID de-duping logic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSDictionary* params = @{ kCWScanKeyMerge : @NO };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSSet* supported_interfaces = [CWInterface interfaceNames];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUInteger interface_error_count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,8 +53,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const base::TimeTicks start_time = base::TimeTicks::Now();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSError* err = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSArray* scan =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [corewlan_interface scanForNetworksWithParameters:params error:&err];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSSet<CWNetwork *>* scan =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [corewlan_interface scanForNetworksWithName:nil error:&err];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int error_code = [err code];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int count = [scan count];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We could get an error code but count != 0 if the scan was interrupted,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8c785066d987b663ed7d3386151ec8144c31cdcc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Peter Varga <pvarga@inf.u-szeged.hu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 04 Oct 2019 16:06:34 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Workaround presumably wrong macOS SDK detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-78997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: If2915cadda10bc29e9a5596dda0b39fa57623167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8626046..430ab8d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/base/mac/foundation_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned int NSSearchPathDomainMask;
</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;'>+-#if defined(OS_IOS) || defined(MAC_OS_X_VERSION_10_15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This macro was added to the Security.framework in the 10.15 SDK:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/gn/base/mac/foundation_util.h.orig 2019-08-21 07:12:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/gn/base/mac/foundation_util.h 2019-10-24 13:19:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,10 +52,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned int NSSearchPathDomainMask;
</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;'>+-typedef struct OpaqueSecTrustRef* SecACLRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct OpaqueSecTrustedApplicationRef* SecTrustedApplicationRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(OS_IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This macro was added to the Security.framework in the 10.15 SDK:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>