From d8c2c5870f84904fe2abb428ffc3ce61e5bafee5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 13 Feb 2019 19:32:00 +0100 Subject: [PATCH] fixed build issue with gcc9 --- qt5-qtbase.spec | 9 ++++++++- qtbase-everywhere-src-5.11.3-gcc9.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qtbase-everywhere-src-5.11.3-gcc9.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f8acdd5..5cf6930 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -53,7 +53,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.11.3 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -122,6 +122,9 @@ Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch # python3 Patch68: qtbase-everywhere-src-5.11.1-python3.patch +# build issue with gcc9 +Patch69: qtbase-everywhere-src-5.11.3-gcc9.patch + # glibc stat ## upstream patches @@ -379,6 +382,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. # FIXME/REBASE #patch67 -p1 -b .xcberror_filter %patch68 -p1 +%patch69 -p1 ## upstream patches %patch500 -p1 -b .rendering-issue @@ -993,6 +997,9 @@ fi %changelog +* Wed Feb 13 2019 Than Ngo - 5.11.3-4 +- fixed build issue with gcc9 + * Sun Feb 03 2019 Rex Dieter - 5.11.3-3 - disable renameat2/statx feature on < f30 (#1668865) diff --git a/qtbase-everywhere-src-5.11.3-gcc9.patch b/qtbase-everywhere-src-5.11.3-gcc9.patch new file mode 100644 index 0000000..e662e22 --- /dev/null +++ b/qtbase-everywhere-src-5.11.3-gcc9.patch @@ -0,0 +1,11 @@ +diff -up qtbase-everywhere-src-5.11.3/src/corelib/global/qrandom.cpp.me qtbase-everywhere-src-5.11.3/src/corelib/global/qrandom.cpp +--- qtbase-everywhere-src-5.11.3/src/corelib/global/qrandom.cpp.me 2019-02-13 19:13:26.115949411 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/global/qrandom.cpp 2019-02-13 19:26:57.822405994 +0100 +@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator + #endif // Q_OS_WINRT + + static SystemGenerator &self(); ++ typedef quint32 result_type; + void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); + + // For std::mersenne_twister_engine implementations that use something