qt5-qtbase: avoid init_priority

See https://codereview.qt-project.org/#/c/221071/
macports · Jun 2, 2018 · 5a7a91f · 5a7a91f
1 parent c844925
commit 5a7a91f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
@@ -147,7 +147,7 @@ array set modules {
         {"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: "
-        "revision 0"
+        "revision 1"
         "License: "
     }
     qtcanvas3d {
@@ -774,6 +774,9 @@ foreach {module module_info} [array get modules] {
                     mkspecs/features/mac/rez.prf
             }
 
+            # see https://codereview.qt-project.org/#/c/221071/
+            patchfiles-append patch-init_priority.diff
+
             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase

diff --git a/aqua/qt5/files/patch-init_priority.diff b/aqua/qt5/files/patch-init_priority.diff
@@ -0,0 +1,11 @@
+--- src/corelib/global/qglobal.h.orig	2018-02-08 11:24:48.000000000 -0700
++++ src/corelib/global/qglobal.h	2018-05-18 20:48:57.000000000 -0700
+@@ -508,7 +508,7 @@
+ #  define Q_ALWAYS_INLINE inline
+ #endif
+
+-#ifdef Q_CC_GNU
++#if defined(Q_CC_GNU) && defined(Q_OS_WIN)
+ #  define QT_INIT_METAOBJECT __attribute__((init_priority(101)))
+ #else
+ #  define QT_INIT_METAOBJECT