<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/f073689df02b2d3244a87511aa6208e5c84ba468">https://github.com/macports/macports-ports/commit/f073689df02b2d3244a87511aa6208e5c84ba468</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f073689df02b2d3244a87511aa6208e5c84ba468
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 23 12:40:04 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: allow "pkg-config --cflags" to work
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Neither
</span><span style='display:block; white-space:pre;color:#404040;'> "pkg-config --cflags Qt5XXX" nor "pkg-config --cflags-only-I Qt5XXX"
</span><span style='display:block; white-space:pre;color:#404040;'> will allow a configure script to set CPPFLAGS since the include
</span><span style='display:block; white-space:pre;color:#404040;'> mechanism relies on -F and -framework BOTH being set
</span>---
aqua/qt5/Portfile | 87 ++++++++++++++++++++------------------
aqua/qt5/files/patch-pc_files.diff | 11 +++++
2 files changed, 58 insertions(+), 40 deletions(-)
<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 2823e28..85cf065 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;'>@@ -141,7 +141,7 @@ array set modules {
</span> {"Qt 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtbase {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +156,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +171,7 @@ array set modules {
</span> {"Qt Canvas 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,7 +186,7 @@ array set modules {
</span> {"Qt Charts"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: {GPL-3 OpenSSLException}"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,7 +201,7 @@ array set modules {
</span> {"Qt Bluetooth" "Qt NFC"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtdatavis3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,7 +216,7 @@ array set modules {
</span> {"Qt Data Visualization"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: {GPL-3 OpenSSLException}"
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +231,7 @@ array set modules {
</span> {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,7 +246,7 @@ array set modules {
</span> {"Qt Reference Documentation"}
"requires all documentation"
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtgamepad {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +261,7 @@ array set modules {
</span> {"Qt Gamepad"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtgraphicaleffects {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +276,7 @@ array set modules {
</span> {"Qt Graphical Effects"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,7 +291,7 @@ array set modules {
</span> {"Qt Image Formats"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtlocation {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,7 +306,7 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtmacextras {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -321,7 +321,7 @@ array set modules {
</span> {"Qt Mac Extras"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +336,7 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,7 +351,7 @@ array set modules {
</span> {"Qt Network Authorization"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtpurchasing {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +366,7 @@ array set modules {
</span> {"Qt Purchasing"}
"in-app purchases is of limited value on desktop"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: {GPL-3 OpenSSLException}"
}
qtquickcontrols {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,7 +381,7 @@ array set modules {
</span> {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Extras"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtquickcontrols2 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,7 +396,7 @@ array set modules {
</span> {"Qt Quick Controls 2"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtremoteobjects {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,7 +411,7 @@ array set modules {
</span> {"Qt Remote Objects"}
"technology preview module"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscript {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,7 +426,7 @@ array set modules {
</span> {"Qt Script" "Qt Script Tools"}
"deprecated in favor QJS* in Qt QML"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtscxml {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,7 +441,7 @@ array set modules {
</span> {"Qt SCXML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,7 +456,7 @@ array set modules {
</span> {"Qt Sensors"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,7 +471,7 @@ array set modules {
</span> {"Qt Serial Bus"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -486,7 +486,7 @@ array set modules {
</span> {"Qt Serial Port"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtspeech {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -501,7 +501,7 @@ array set modules {
</span> {"Qt Speech"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -516,7 +516,7 @@ array set modules {
</span> {"Qt SVG"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -531,7 +531,7 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -546,7 +546,7 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtvirtualkeyboard {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -561,7 +561,7 @@ array set modules {
</span> {"Qt Virtual Keyboard"}
"GPLv3 license only"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -576,7 +576,7 @@ array set modules {
</span> {"Qt WebChannel"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtwebengine {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -591,7 +591,7 @@ array set modules {
</span> {"Qt WebEngine"}
"very large and relatively new"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtwebglplugin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -606,7 +606,7 @@ array set modules {
</span> {"QPA plugin for running an application via a browser using streamed WebGL commands"}
"technology preview module; GPLv3 license only"
"variant overrides: ~docs ~examples"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: {GPL-3 OpenSSLException}"
}
qtwebkit {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -621,7 +621,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -636,7 +636,7 @@ array set modules {
</span> {"examples for Qt WebKit"}
"community support only (use Qt WebEngine)"
"variant overrides: ++examples ~docs "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,7 +651,7 @@ array set modules {
</span> {"Qt WebSockets"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,7 +666,7 @@ array set modules {
</span> {"Qt WebView"}
"new in 5.6.0; requires qtwebengine"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtxmlpatterns {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -681,7 +681,7 @@ array set modules {
</span> {"Qt XML Patterns"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -699,7 +699,7 @@ array set modules {
</span> #
###############################################################################
array set sql_plugins {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {sqlite SQLite "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {sqlite SQLite "revision 1"} {
</span> {
"sqlite3"
"port:sqlite3"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,7 +709,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {psql PostgreSQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {psql PostgreSQL "revision 1"} {
</span> {
"postgresql96"
"port:postgresql96"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -743,7 +743,7 @@ array set sql_plugins {
</span> ""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {mysql MySQL "revision 0"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {mysql MySQL "revision 1"} {
</span> {
"mariadb55"
"port:mariadb"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -861,6 +861,13 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Neither "pkg-config --cflags Qt5Core" nor "pkg-config --cflags-only-I Qt5Core" will allow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a configure script to find CPPFLAGS since the include mechanism relies on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -F and -framework BOTH being set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See e.g. octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See the files mkspecs/features/qt_module.prf and qmake/generators/makefile.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
# only runs test code on 32-bit systems
patchfiles-append patch-tst_benchlibcallgrind.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-pc_files.diff b/aqua/qt5/files/patch-pc_files.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..94caf13
</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-pc_files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmake/generators/makefile.cpp.orig 2018-12-03 04:15:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmake/generators/makefile.cpp 2018-12-22 06:02:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3368,7 +3368,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t << "-I${includedir}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && libDir != QLatin1String("/Library/Frameworks")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- t << " -F${libdir}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ t << " -F${libdir} -I${prefix}/include";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>