<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/5a7a91f7e048f1b7191504f20336bc66d19ef590">https://github.com/macports/macports-ports/commit/5a7a91f7e048f1b7191504f20336bc66d19ef590</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5a7a91f7e048f1b7191504f20336bc66d19ef590
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Wed May 23 02:24:39 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtbase: avoid init_priority
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://codereview.qt-project.org/#/c/221071/
</span>---
aqua/qt5/Portfile | 5 ++++-
aqua/qt5/files/patch-init_priority.diff | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
<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 62d66cb..95bf726 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;'>@@ -147,7 +147,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 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,6 +774,9 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://codereview.qt-project.org/#/c/221071/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-init_priority.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-init_priority.diff b/aqua/qt5/files/patch-init_priority.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..25146f7
</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-init_priority.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;'>+--- src/corelib/global/qglobal.h.orig 2018-02-08 11:24:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qglobal.h 2018-05-18 20:48:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +508,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define Q_ALWAYS_INLINE inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_CC_GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(Q_CC_GNU) && defined(Q_OS_WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define QT_INIT_METAOBJECT
</span></pre><pre style='margin:0'>
</pre>