<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/66ad17ef2ac70cd97ae46cc40f8512ff9c87f01e">https://github.com/macports/macports-ports/commit/66ad17ef2ac70cd97ae46cc40f8512ff9c87f01e</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 66ad17e qt5*-qtbase: fix ICU test
</span>66ad17e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 66ad17ef2ac70cd97ae46cc40f8512ff9c87f01e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Nov 14 10:30:35 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtbase: fix ICU test
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ICU requires C++11.
</span><span style='display:block; white-space:pre;color:#404040;'> QtBase uses -std=c++XYZ in the build but not the configure phase.
</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/59434
</span>---
aqua/qt53/Portfile | 4 ++++
aqua/qt53/files/patch-qtbase-icu_test.diff | 9 +++++++++
aqua/qt55/Portfile | 4 ++++
aqua/qt55/files/patch-qtbase-icu_test.diff | 9 +++++++++
aqua/qt56/Portfile | 4 ++++
aqua/qt56/files/patch-qtbase-icu_test.diff | 9 +++++++++
aqua/qt57/Portfile | 4 ++++
aqua/qt57/files/patch-qtbase-icu_test.diff | 9 +++++++++
8 files changed, 52 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index feec53f..92ed639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -744,6 +744,10 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU now requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/59312
use_xcode yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/files/patch-qtbase-icu_test.diff b/aqua/qt53/files/patch-qtbase-icu_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b2d95ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/files/patch-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/icu/icu.pro.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/icu/icu.pro 2019-11-13 10:09:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES = icu.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += console
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$PWD/../../../src/3rdparty/icu_dependency.pri)
</span><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 c076d46..370f26b 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;'>@@ -764,6 +764,10 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU now requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/59312
use_xcode yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtbase-icu_test.diff b/aqua/qt55/files/patch-qtbase-icu_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b2d95ec
</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-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/icu/icu.pro.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/icu/icu.pro 2019-11-13 10:09:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES = icu.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += console
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$PWD/../../../src/3rdparty/icu_dependency.pri)
</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 45564dd..7f8b11d 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;'>@@ -808,6 +808,10 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU now requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/59312
use_xcode yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtbase-icu_test.diff b/aqua/qt56/files/patch-qtbase-icu_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b2d95ec
</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-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/icu/icu.pro.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/icu/icu.pro 2019-11-13 10:09:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES = icu.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += console
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$PWD/../../../src/3rdparty/icu_dependency.pri)
</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 b8c3b32..f160f80 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;'>@@ -879,6 +879,10 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU now requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/59312
use_xcode yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtbase-icu_test.diff b/aqua/qt57/files/patch-qtbase-icu_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b2d95ec
</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-qtbase-icu_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.tests/unix/icu/icu.pro.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.tests/unix/icu/icu.pro 2019-11-13 10:09:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES = icu.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += console
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= qt dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include($$PWD/../../../src/3rdparty/icu_dependency.pri)
</span></pre><pre style='margin:0'>
</pre>