[153655] trunk/dports/aqua/qt5

raimue at macports.org raimue at macports.org
Thu Oct 6 23:42:29 CEST 2016


Revision: 153655
          https://trac.macports.org/changeset/153655
Author:   raimue at macports.org
Date:     2016-10-06 14:42:28 -0700 (Thu, 06 Oct 2016)
Log Message:
-----------
qt5-qtconnectivity: fix build with 10.12 SDK

Closes #52203

Modified Paths:
--------------
    trunk/dports/aqua/qt5/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2016-10-06 20:52:37 UTC (rev 153654)
+++ trunk/dports/aqua/qt5/Portfile	2016-10-06 21:42:28 UTC (rev 153655)
@@ -874,6 +874,12 @@
         PortGroup cxx11 1.0
     }
 
+    # special case
+    if { ${subport} eq "${name}-qtconnectivity" } {
+        # https://codereview.qt-project.org/#/c/172619/
+        patchfiles-append patch-qtconn-for-10.12.diff
+    }
+
     # accommodating variant request varies depending on how qtbase was built
     pre-configure {
 

Added: trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff	                        (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff	2016-10-06 21:42:28 UTC (rev 153655)
@@ -0,0 +1,68 @@
+From 462323dba4f963844e8c9911da27a0d21e4abf43 Mon Sep 17 00:00:00 2001
+From: Samuel Gaist <samuel.gaist at edeltech.ch>
+Date: Sun, 2 Oct 2016 21:19:39 +0200
+Subject: [PATCH] Fixed build with MaxOSX10.12 SDK
+
+This patch adds missing includes that allows to build the module with
+the 10.12 SDK and Xcode 8.
+
+Change-Id: Ieab48f6a0582b916ceecbbb9a01a4169d6ba53f5
+Reviewed-by: Jake Petroules <jake.petroules at qt.io>
+---
+ src/bluetooth/osx/osxbtcentralmanager_p.h | 8 ++++++++
+ src/bluetooth/osx/osxbtledeviceinquiry.mm | 5 +++++
+ src/bluetooth/osx/osxbtutility.mm         | 3 +++
+ 3 files changed, 16 insertions(+)
+
+diff --git src/bluetooth/osx/osxbtcentralmanager_p.h src/bluetooth/osx/osxbtcentralmanager_p.h
+index 1ff33c1..68b32f3 100644
+--- src/bluetooth/osx/osxbtcentralmanager_p.h
++++ src/bluetooth/osx/osxbtcentralmanager_p.h
+@@ -61,6 +61,14 @@
+ 
+ #include "corebluetoothwrapper_p.h"
+ 
++#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
++#include <CoreBluetooth/CBService.h>
++#include <CoreBluetooth/CBCharacteristic.h>
++#include <CoreBluetooth/CBDescriptor.h>
++#include <CoreBluetooth/CBCentralManager.h>
++#include <CoreBluetooth/CBPeripheral.h>
++#endif
++
+ @class QT_MANGLE_NAMESPACE(OSXBTCentralManager);
+ 
+ QT_BEGIN_NAMESPACE
+diff --git src/bluetooth/osx/osxbtledeviceinquiry.mm src/bluetooth/osx/osxbtledeviceinquiry.mm
+index 5cf9b19..5a2f2db 100644
+--- src/bluetooth/osx/osxbtledeviceinquiry.mm
++++ src/bluetooth/osx/osxbtledeviceinquiry.mm
+@@ -42,6 +42,11 @@
+ 
+ #include "corebluetoothwrapper_p.h"
+ 
++#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
++#import <CoreBluetooth/CBCentralManager.h>
++#import <CoreBluetooth/CBPeripheral.h>
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ namespace OSXBluetooth {
+diff --git src/bluetooth/osx/osxbtutility.mm src/bluetooth/osx/osxbtutility.mm
+index 08ff699..32f6f74 100644
+--- src/bluetooth/osx/osxbtutility.mm
++++ src/bluetooth/osx/osxbtutility.mm
+@@ -41,6 +41,9 @@
+ #ifndef QT_IOS_BLUETOOTH
+ 
+ #import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
++#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
++#import <CoreBluetooth/CBUUID.h>
++#endif
+ 
+ #endif
+ 
+-- 
+2.10.0
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161006/f9e79096/attachment-0002.html>


More information about the macports-changes mailing list