<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/37a0b34e9793d9c09e24e8f23af56f15dfb3f770">https://github.com/macports/macports-ports/commit/37a0b34e9793d9c09e24e8f23af56f15dfb3f770</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 37a0b34 qt5*-qtwebengine: allow Xcode versions >= 10.0
</span>37a0b34 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37a0b34e9793d9c09e24e8f23af56f15dfb3f770
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Oct 20 09:23:07 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtwebengine: allow Xcode versions >= 10.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56829
</span>---
aqua/qt55/Portfile | 3 ++
aqua/qt55/files/patch-qtwebengine_xcode10.diff | 38 +++++++++++++++
aqua/qt56/Portfile | 3 ++
aqua/qt56/files/patch-qtwebengine_xcode10.diff | 38 +++++++++++++++
aqua/qt57/Portfile | 3 ++
aqua/qt57/files/patch-qtwebengine_xcode10.diff | 38 +++++++++++++++
aqua/qt58/Portfile | 3 ++
aqua/qt58/files/patch-qtwebengine_xcode10.diff | 67 ++++++++++++++++++++++++++
aqua/qt59/Portfile | 3 ++
aqua/qt59/files/patch-qtwebengine_xcode10.diff | 67 ++++++++++++++++++++++++++
10 files changed, 263 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7fe523..bf112c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1339,6 +1339,9 @@ foreach {module module_info} [array get modules] {
</span> # see https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/chromium/printing/backend/print_backend_cups.cc?h=53-based&id=3bd01037ab73b3ffbf4abbf97c54443a91b2fc4d
# see https://bugs.chromium.org/p/chromium/issues/detail?id=622493
patchfiles-append patch-cups.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_xcode10.diff
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtwebengine_xcode10.diff b/aqua/qt55/files/patch-qtwebengine_xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5f11a63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/mkspecs/features/functions.prf.orig 2018-10-20 09:02:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/mkspecs/features/functions.prf 2018-10-20 09:05:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Static builds of QtWebEngine aren't supported.")
</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;'>+- osx:lessThan(QMAKE_XCODE_VERSION, 5.1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osx:!isMinXcodeVersion(6, 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
</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;'>+@@ -29,6 +29,26 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(isGCCVersionSupported) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The below will work for gcc 4.7 and up and also match gcc 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greaterThan(QT_GCC_MINOR_VERSION, 6):return(true)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1949621..40e159a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1365,6 +1365,9 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_xcode10.diff
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtwebengine_xcode10.diff b/aqua/qt56/files/patch-qtwebengine_xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e0b17e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/mkspecs/features/functions.prf.orig 2016-11-30 20:08:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/mkspecs/features/functions.prf 2018-10-20 08:40:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else:osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lessThan(QMAKE_XCODE_VERSION, 6.1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !isMinXcodeVersion(6, 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 6.1 is required to build Qt WebEngine.")
</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;'>+@@ -111,6 +111,26 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(isMinOSXSDKVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_minor = $$2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 825c8f1..8fb5124 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1447,6 +1447,9 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_xcode10.diff
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtwebengine_xcode10.diff b/aqua/qt57/files/patch-qtwebengine_xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e0b17e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/mkspecs/features/functions.prf.orig 2016-11-30 20:08:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/mkspecs/features/functions.prf 2018-10-20 08:40:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else:osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lessThan(QMAKE_XCODE_VERSION, 6.1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !isMinXcodeVersion(6, 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 6.1 is required to build Qt WebEngine.")
</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;'>+@@ -111,6 +111,26 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(isMinOSXSDKVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_minor = $$2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b894fc..724fa47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1431,6 +1431,9 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # the following libraries, even when available, do not seem to affect the build
# so turn them off
patchfiles-append patch-qtwebengine_external.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/files/patch-qtwebengine_xcode10.diff b/aqua/qt58/files/patch-qtwebengine_xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b8b17a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9bc7fd3ad241daf464fe065667ded711fdaee160 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 16 Jul 2018 13:24:51 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix Xcode version check to work with major versions >= 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We used lessThan for the Xcode version check, which started to fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when comparing Xcode 10 with Xcode 7.3, because lessThan first tries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to convert the arguments to ints and if that fails, it does string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+comparison instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Rewrite the code to be similar to the SDK checks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We can't use the qmake versionAtLeast function because it was added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in Qt 5.10, and we still need to be able to build against Qt 5.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-69476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 0fc07d2943753f444f3eeccd9fb1dfde0938cb70)
</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;'>+ mkspecs/features/functions.prf | 22 +++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/3rdparty | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 22 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b78d2a11..ac0c9837 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/qmake/mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/qmake/mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@ defineTest(isPlatformSupported) {
</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;'>+ } else:osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lessThan(QMAKE_XCODE_VERSION, 5.1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !isMinXcodeVersion(5, 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
</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;'>+@@ -255,6 +255,26 @@ defineTest(isMinOSXSDKVersion) {
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(isMinWinSDKVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_minor = $$2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a8e3ea..f37c428 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1419,6 +1419,9 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # the following libraries, even when available, do not seem to affect the build
# so turn them off
configure.post_args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/files/patch-qtwebengine_xcode10.diff b/aqua/qt59/files/patch-qtwebengine_xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3efc28c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/files/patch-qtwebengine_xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9bc7fd3ad241daf464fe065667ded711fdaee160 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 16 Jul 2018 13:24:51 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix Xcode version check to work with major versions >= 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We used lessThan for the Xcode version check, which started to fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when comparing Xcode 10 with Xcode 7.3, because lessThan first tries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to convert the arguments to ints and if that fails, it does string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+comparison instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Rewrite the code to be similar to the SDK checks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We can't use the qmake versionAtLeast function because it was added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in Qt 5.10, and we still need to be able to build against Qt 5.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-69476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 0fc07d2943753f444f3eeccd9fb1dfde0938cb70)
</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;'>+ mkspecs/features/functions.prf | 22 +++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/3rdparty | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 22 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b78d2a11..ac0c9837 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/functions.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@ defineTest(isPlatformSupported) {
</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;'>+ } else:osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lessThan(QMAKE_XCODE_VERSION, 5.1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !isMinXcodeVersion(5, 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
</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;'>+@@ -241,6 +241,26 @@ defineTest(isMinOSXSDKVersion) {
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++defineTest(isMinXcodeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_minor = $$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ requested_patch = $$3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_minor): requested_minor = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(requested_patch): requested_patch = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_var = QMAKE_XCODE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major_version = $$section($$target_var, ., 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor_version = $$section($$target_var, ., 1, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ patch_version = $$section($$target_var, ., 2, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(minor_version): minor_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(patch_version): patch_version = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ greaterThan(major_version, $$requested_major):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ equals(major_version, $$requested_major):equals(minor_version, $$requested_minor):!lessThan(patch_version, $$requested_patch):return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(isMinWinSDKVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_major = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested_minor = $$2
</span></pre><pre style='margin:0'>
</pre>