<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[153655] trunk/dports/aqua/qt5</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/153655">153655</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-10-06 14:42:28 -0700 (Thu, 06 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5-qtconnectivity: fix build with 10.12 SDK
Closes #52203</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5Portfile">trunk/dports/aqua/qt5/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5filespatchqtconnfor1012diff">trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5/Portfile (153654 => 153655)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -874,6 +874,12 @@
</span><span class="cx"> PortGroup cxx11 1.0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # special case
+ if { ${subport} eq "${name}-qtconnectivity" } {
+ # https://codereview.qt-project.org/#/c/172619/
+ patchfiles-append patch-qtconn-for-10.12.diff
+ }
+
</ins><span class="cx"> # accommodating variant request varies depending on how qtbase was built
</span><span class="cx"> pre-configure {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaquaqt5filespatchqtconnfor1012diff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-qtconn-for-10.12.diff (0 => 153655)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+From 462323dba4f963844e8c9911da27a0d21e4abf43 Mon Sep 17 00:00:00 2001
+From: Samuel Gaist <samuel.gaist@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@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
+
</ins></span></pre>
</div>
</div>
</body>
</html>