diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-04-19 08:23:12 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-04-19 08:23:12 +0000 |
| commit | 1a0656e371a111bc94d8e93128728514f69fc174 (patch) | |
| tree | 9acf5d78d2a698134220c3a4c996ddad6cd767c0 /x11/qt5-qtbase | |
| parent | 1b9af1217dc819f264960c6643056a44244bf33f (diff) | |
| download | pkgsrc-1a0656e371a111bc94d8e93128728514f69fc174.tar.gz | |
qt5: Pull in upstream fix for init_priority.
Fixes PR#53197 from Mike Owens.
Diffstat (limited to 'x11/qt5-qtbase')
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index ec432aa86aa..243f134c748 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2018/03/01 20:09:49 adam Exp $ +$NetBSD: distinfo,v 1.40 2018/04/19 08:23:12 jperkin Exp $ SHA1 (qtbase-everywhere-src-5.10.1.tar.xz) = 234275f97ca401ae3df5e0c3d937e68056957bbe RMD160 (qtbase-everywhere-src-5.10.1.tar.xz) = b0587af8736bedc9b80ceb85f10ece64389a904c @@ -13,6 +13,7 @@ SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = 4387447f0f23f0f8c623c0c019ab632bc1cb5617 SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = ec5487cc27518b2588d40e7ad59eeee89e93b055 +SHA1 (patch-src_corelib_global_qglobal.h) = ba87f0711ed0151f3b98ca5269634d47b8cbd6c9 SHA1 (patch-src_corelib_io_io.pri) = fd2f93b5af4dda729b274dd0d8f82ca29b3cb62a SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h b/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h new file mode 100644 index 00000000000..0a7dcc88402 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_global_qglobal.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_corelib_global_qglobal.h,v 1.1 2018/04/19 08:23:12 jperkin Exp $ + +Pull in upstream fix from https://codereview.qt-project.org/#/c/221071 + +--- src/corelib/global/qglobal.h.orig 2018-02-08 18:24:48.000000000 +0000 ++++ src/corelib/global/qglobal.h +@@ -508,7 +508,7 @@ using qsizetype = QIntegerForSizeof<std: + # 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 |