import qt5-qtbase-5.12.5-5.el8

2020-05-14 22:39:43 +00:00 · 2020-05-14 22:39:43 +00:00 · 3c4f039ccc
commit 3c4f039ccc
24 changed files with 2549 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+SOURCES/qtbase-everywhere-src-5.12.5.tar.xz
--- a/.qt5-qtbase.metadata
+++ b/.qt5-qtbase.metadata
@ -0,0 +1 @@
+47145a722a8a8457121071f60b4e44fc66c58979 SOURCES/qtbase-everywhere-src-5.12.5.tar.xz
--- a/SOURCES/10-qt5-check-opengl2.sh
+++ b/SOURCES/10-qt5-check-opengl2.sh
@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -z "$QT_XCB_FORCE_SOFTWARE_OPENGL" ]; then
+
+QT5_CHECK_OPENGL_VERSION=`LANG=C glxinfo 2> /dev/null | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g'` ||:
+
+if [ "$QT5_CHECK_OPENGL_VERSION" == "1" ]; then
+  QT_XCB_FORCE_SOFTWARE_OPENGL=1
+  export QT_XCB_FORCE_SOFTWARE_OPENGL
+fi
+
+unset QT5_CHECK_OPENGL_VERSION
+
+fi
--- a/SOURCES/macros.qt5-qtbase
+++ b/SOURCES/macros.qt5-qtbase
@ -0,0 +1,4 @@
+%_qt5 @@NAME@@
+%_qt5_epoch @@EPOCH@@
+%_qt5_version @@VERSION@@
+%_qt5_evr @@EVR@@
--- a/SOURCES/qconfig-multilib.h
+++ b/SOURCES/qconfig-multilib.h
@ -0,0 +1,23 @@
+/* qconfig.h */
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because qconfig.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#ifndef QCONFIG_MULTILIB_H
+#define QCONFIG_MULTILIB_H
+
+#ifndef __WORDSIZE
+#include <bits/wordsize.h>
+#endif
+
+#if __WORDSIZE == 32
+#include "QtCore/qconfig-32.h"
+#elif __WORDSIZE == 64
+#include "QtCore/qconfig-64.h"
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+
--- a/SOURCES/qt5-qtbase-5.12.1-firebird.patch
+++ b/SOURCES/qt5-qtbase-5.12.1-firebird.patch
@ -0,0 +1,29 @@
+diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json
+--- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird	2019-01-28 11:11:52.000000000 -0600
+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json	2019-02-03 13:41:27.392305128 -0600
+@@ -49,10 +49,11 @@
+         "ibase": {
+             "label": "InterBase",
+             "test": {},
+-            "headers": "ibase.h",
+            "headers": "firebird/ibase.h",
+             "sources": [
+                 { "libs": "-lgds32_ms", "condition": "config.win32" },
+-                { "libs": "-lgds", "condition": "!config.win32" }
+                { "libs": "-lgds", "condition": "!config.win32" },
+                { "libs": "-lfbclient", "condition": "!config.win32" }
+             ]
+         },
+         "mysql": {
+diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+--- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird	2019-01-28 11:11:52.000000000 -0600
+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h	2019-02-03 13:27:30.683142996 -0600
+@@ -52,7 +52,7 @@
+ //
+ 
+ #include <QtSql/qsqldriver.h>
+-#include <ibase.h>
+#include <firebird/ibase.h>
+ 
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_IBASE
--- a/SOURCES/qt5-qtbase-cxxflag.patch
+++ b/SOURCES/qt5-qtbase-cxxflag.patch
@ -0,0 +1,13 @@
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index e7e6ee1..ff2a939 100644
+--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
+@@ -32,7 +32,7 @@
+ #
+ 
+ QMAKE_CFLAGS_OPTIMIZE      = -O2
+-QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+QMAKE_CFLAGS_OPTIMIZE_FULL = -O2
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ 
--- a/SOURCES/qtbase-add-expansion-limit-for-entities.patch
+++ b/SOURCES/qtbase-add-expansion-limit-for-entities.patch
@ -0,0 +1,146 @@
+From f432c08882ffebe5074ea28de871559a98a4d094 Mon Sep 17 00:00:00 2001
+From: Lars Knoll <lars.knoll@qt.io>
+Date: Wed, 26 Feb 2020 10:42:10 +0100
+Subject: Add an expansion limit for entities
+
+Recursively defined entities can easily exhaust all available
+memory. Limit entity expansion to a default of 4096 characters to
+avoid DoS attacks when a user loads untrusted content.
+
+[ChangeLog][QtCore][QXmlStream] QXmlStreamReader does now
+limit the expansion of entities to 4096 characters. Documents where
+a single entity expands to more characters than the limit are not
+considered well formed. The limit is there to avoid DoS attacks through
+recursively expanding entities when loading untrusted content. Qt 5.15
+will add methods that allow changing that limit.
+
+Fixes: QTBUG-47417
+Change-Id: I94387815d74fcf34783e136387ee57fac5ded0c9
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
+(cherry picked from commit fd4be84d23a0db4186cb42e736a9de3af722c7f7)
+Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
+---
+ src/corelib/serialization/qxmlstream.g             | 14 ++++++++++++-
+ src/corelib/serialization/qxmlstream_p.h           | 14 ++++++++++++-
+ .../serialization/qxmlstream/tst_qxmlstream.cpp    | 23 ++++++++++++++++++++--
+ 3 files changed, 47 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
+index 10bfcd491c..5726bafb26 100644
+--- a/src/corelib/serialization/qxmlstream.g
+++ b/src/corelib/serialization/qxmlstream.g
+@@ -277,9 +277,19 @@ public:
+     QHash<QStringView, Entity> entityHash;
+     QHash<QStringView, Entity> parameterEntityHash;
+     QXmlStreamSimpleStack<Entity *>entityReferenceStack;
+    int entityExpansionLimit = 4096;
+    int entityLength = 0;
+     inline bool referenceEntity(Entity &entity) {
+         if (entity.isCurrentlyReferenced) {
+-            raiseWellFormedError(QXmlStream::tr("Recursive entity detected."));
+            raiseWellFormedError(QXmlStream::tr("Self-referencing entity detected."));
+            return false;
+        }
+        // entityLength represents the amount of additional characters the
+        // entity expands into (can be negative for e.g. &amp;). It's used to
+        // avoid DoS attacks through recursive entity expansions
+        entityLength += entity.value.size() - entity.name.size() - 2;
+        if (entityLength > entityExpansionLimit) {
+            raiseWellFormedError(QXmlStream::tr("Entity expands to more characters than the entity expansion limit."));
+             return false;
+         }
+         entity.isCurrentlyReferenced = true;
+@@ -830,6 +840,8 @@ entity_done ::= ENTITY_DONE;
+ /.
+         case $rule_number:
+             entityReferenceStack.pop()->isCurrentlyReferenced = false;
+            if (entityReferenceStack.isEmpty())
+                entityLength = 0;
+             clearSym();
+         break;
+ ./
+diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
+index 61f501f81b..31053f8e0b 100644
+--- a/src/corelib/serialization/qxmlstream_p.h
+++ b/src/corelib/serialization/qxmlstream_p.h
+@@ -774,9 +774,19 @@ public:
+     QHash<QStringView, Entity> entityHash;
+     QHash<QStringView, Entity> parameterEntityHash;
+     QXmlStreamSimpleStack<Entity *>entityReferenceStack;
+    int entityExpansionLimit = 4096;
+    int entityLength = 0;
+     inline bool referenceEntity(Entity &entity) {
+         if (entity.isCurrentlyReferenced) {
+-            raiseWellFormedError(QXmlStream::tr("Recursive entity detected."));
+            raiseWellFormedError(QXmlStream::tr("Self-referencing entity detected."));
+            return false;
+        }
+        // entityLength represents the amount of additional characters the
+        // entity expands into (can be negative for e.g. &amp;). It's used to
+        // avoid DoS attacks through recursive entity expansions
+        entityLength += entity.value.size() - entity.name.size() - 2;
+        if (entityLength > entityExpansionLimit) {
+            raiseWellFormedError(QXmlStream::tr("Entity expands to more characters than the entity expansion limit."));
+             return false;
+         }
+         entity.isCurrentlyReferenced = true;
+@@ -1308,6 +1318,8 @@ bool QXmlStreamReaderPrivate::parse()
+
+         case 10:
+             entityReferenceStack.pop()->isCurrentlyReferenced = false;
+            if (entityReferenceStack.isEmpty())
+                entityLength = 0;
+             clearSym();
+         break;
+
+diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+index 8fdf91b090..1f9a0d575d 100644
+--- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+@@ -393,8 +393,6 @@ public:
+                 return true;
+             }
+
+-            QXmlStreamReader reader(&inputFile);
+-
+             /* See testcases.dtd which reads: 'Nonvalidating parsers
+              * must also accept "invalid" testcases, but validating ones must reject them.' */
+             if(type == QLatin1String("invalid") || type == QLatin1String("valid"))
+@@ -580,6 +578,8 @@ private slots:
+     void roundTrip() const;
+     void roundTrip_data() const;
+
+    void entityExpansionLimit() const;
+
+ private:
+     static QByteArray readFile(const QString &filename);
+
+@@ -1756,6 +1756,25 @@ void tst_QXmlStream::roundTrip_data() const
+         "</root>\n";
+ }
+
+void tst_QXmlStream::entityExpansionLimit() const
+{
+    QString xml = QStringLiteral("<?xml version=\"1.0\"?>"
+                                 "<!DOCTYPE foo ["
+                                 "<!ENTITY a \"0123456789\" >"
+                                 "<!ENTITY b \"&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;\" >"
+                                 "<!ENTITY c \"&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;\" >"
+                                 "<!ENTITY d \"&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;\" >"
+                                 "]>"
+                                 "<foo>&d;&d;&d;</foo>");
+    {
+        QXmlStreamReader reader(xml);
+        do {
+            reader.readNext();
+        } while (!reader.atEnd());
+        QCOMPARE(reader.error(), QXmlStreamReader::NotWellFormedError);
+    }
+}
+
+ void tst_QXmlStream::roundTrip() const
+ {
+     QFETCH(QString, in);
+--
+cgit v1.2.1
--- a/SOURCES/qtbase-allow-dbus-not-running-during-build.patch
+++ b/SOURCES/qtbase-allow-dbus-not-running-during-build.patch
@ -0,0 +1,13 @@
+diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
+index fbd89e40..722281c1 100644
+--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
+@@ -37,7 +37,7 @@ else:!qtConfig(process):                    SUBDIRS -= tools
+ !cross_compile:qtHaveModule(dbus) {
+     !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE 2>&1") {
+         qtConfig(dbus-linked): \
+-            error("QtDBus is enabled but session bus is not available. Please check the installation.")
+            warning("QtDBus is enabled but session bus is not available. Please check the installation.")
+         else: \
+             warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
+         SUBDIRS -= dbus
--- a/SOURCES/qtbase-ambiguous-python-shebang.patch
+++ b/SOURCES/qtbase-ambiguous-python-shebang.patch
@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py
+index 8cdcb370..b0c927ea 100755
+--- a/mkspecs/features/uikit/devices.py
+++ b/mkspecs/features/uikit/devices.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ 
+ #############################################################################
+ ##
+diff --git a/tests/manual/xembed-raster/gtk-embedder.py b/tests/manual/xembed-raster/gtk-embedder.py
+index 5c37fd44..86ffa9fd 100755
+--- a/tests/manual/xembed-raster/gtk-embedder.py
+++ b/tests/manual/xembed-raster/gtk-embedder.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2013 Canonical Ltd.
+diff --git a/tests/manual/xembed-widgets/gtk-embedder.py b/tests/manual/xembed-widgets/gtk-embedder.py
+index 2a7c92db..93135b14 100755
+--- a/tests/manual/xembed-widgets/gtk-embedder.py
+++ b/tests/manual/xembed-widgets/gtk-embedder.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
+#!/usr/bin/python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2013 Canonical Ltd.
--- a/SOURCES/qtbase-do-not-load-plugin-from-pwd.patch
+++ b/SOURCES/qtbase-do-not-load-plugin-from-pwd.patch
@ -0,0 +1,28 @@
+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <ogoffart@woboq.com>
+Date: Fri, 8 Nov 2019 11:30:40 +0100
+Subject: Do not load plugin from the $PWD
+
+I see no reason why this would make sense to look for plugins in the current
+directory. And when there are plugins there, it may actually be wrong
+
+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/plugin/qpluginloader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index cadff4f32b..c2443dbdda 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
+         paths.append(fileName.left(slash)); // don't include the '/'
+     } else {
+         paths = QCoreApplication::libraryPaths();
+-        paths.prepend(QStringLiteral(".")); // search in current dir first
+     }
+
+     for (const QString &path : qAsConst(paths)) {
+--
+cgit v1.2.1
--- a/SOURCES/qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
+++ b/SOURCES/qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
@ -0,0 +1,14 @@
+diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo	2019-04-30 15:18:24.886346423 -0500
+++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in	2019-04-30 15:19:48.303873296 -0500
+@@ -66,8 +66,10 @@ unset(_GL_INCDIRS)
+ # Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
+ # optional.
+ 
+if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include")
+ list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
+ set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
+endif()
+ 
+ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
+ 
--- a/SOURCES/qtbase-hidpi_scale_at_192.patch
+++ b/SOURCES/qtbase-hidpi_scale_at_192.patch
@ -0,0 +1,12 @@
+diff -up qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192 qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp
+--- qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192	2019-02-03 13:21:27.866906481 -0600
+++ qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp	2019-02-03 13:23:47.554767565 -0600
+@@ -744,7 +744,7 @@ void QXcbScreen::updateGeometry(const QR
+     // Use 128 as a reference DPI on small screens. This favors "small UI" over "large UI".
+     qreal referenceDpi = physicalSize().width() <= 320 ? 128 : 96;
+ 
+-    m_pixelDensity = qMax(1, qRound(dpi/referenceDpi));
+    m_pixelDensity = qMax(1, (int) (dpi/referenceDpi)); //instead of rounding at 1.5, round at 2.0 (same as GNOME)
+     m_geometry = geometry;
+     m_availableGeometry = geometry & m_virtualDesktop->workArea();
+     QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);
--- a/SOURCES/qtbase-multilib_optflags.patch
+++ b/SOURCES/qtbase-multilib_optflags.patch
@ -0,0 +1,33 @@
+diff -r -u a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
+--- a/mkspecs/linux-g++/qmake.conf	2015-10-30 06:20:01.000000000 -0200
+++ b/mkspecs/linux-g++/qmake.conf	2015-11-05 11:23:23.230741601 -0200
+@@ -5,6 +5,7 @@
+ MAKEFILE_GENERATOR      = UNIX
+ CONFIG                 += incremental
+ QMAKE_INCREMENTAL_STYLE = sublib
+QMAKE_CFLAGS_RELEASE   += -O2
+ 
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+diff -r -u a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
+--- a/mkspecs/linux-g++-32/qmake.conf	2015-10-30 06:20:01.000000000 -0200
+++ b/mkspecs/linux-g++-32/qmake.conf	2015-11-05 11:22:19.761494470 -0200
+@@ -10,6 +10,7 @@
+ 
+ QMAKE_CFLAGS            = -m32
+ QMAKE_LFLAGS            = -m32
+QMAKE_CFLAGS_RELEASE   += -O2
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -r -u a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
+--- a/mkspecs/linux-g++-64/qmake.conf	2015-10-30 06:20:01.000000000 -0200
+++ b/mkspecs/linux-g++-64/qmake.conf	2015-11-05 11:22:49.497610248 -0200
+@@ -13,6 +13,7 @@
+ 
+ QMAKE_CFLAGS            = -m64
+ QMAKE_LFLAGS            = -m64
+QMAKE_CFLAGS_RELEASE   += -O2
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
--- a/SOURCES/qtbase-opensource-src-5.3.2-QTBUG-35459.patch
+++ b/SOURCES/qtbase-opensource-src-5.3.2-QTBUG-35459.patch
@ -0,0 +1,13 @@
+diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp
+diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h
+--- qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459	2014-09-11 05:48:05.000000000 -0500
+++ qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h	2014-09-16 09:35:01.189255615 -0500
+@@ -223,7 +223,7 @@ private:
+     // for the DTD currently being parsed.
+     static const int dtdRecursionLimit = 2;
+     // The maximum amount of characters an entity value may contain, after expansion.
+-    static const int entityCharacterLimit = 1024;
+    static const int entityCharacterLimit = 4096;
+ 
+     const QString &string();
+     void stringClear();
--- a/SOURCES/qtbase-opensource-src-5.7.1-moc_macros.patch
+++ b/SOURCES/qtbase-opensource-src-5.7.1-moc_macros.patch
@ -0,0 +1,15 @@
+diff -up qtbase-opensource-src-5.7.1/src/tools/moc/main.cpp.moc_WORDSIZE qtbase-opensource-src-5.7.1/src/tools/moc/main.cpp
+--- qtbase-opensource-src-5.7.1/src/tools/moc/main.cpp.moc_WORDSIZE	2016-12-01 02:17:04.000000000 -0600
+++ qtbase-opensource-src-5.7.1/src/tools/moc/main.cpp	2016-12-08 12:37:28.931589338 -0600
+@@ -179,6 +179,11 @@ int runMoc(int argc, char **argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+    Macro macro;
+    macro.symbols = Preprocessor::tokenize(QByteArray::number(Q_PROCESSOR_WORDSIZE*8), 1, Preprocessor::TokenizeDefine);
+    macro.symbols.removeLast(); // remove the EOF symbol
+    pp.macros.insert("__WORDSIZE", macro);
+ 
+     // Don't stumble over GCC extensions
+     Macro dummyVariadicFunctionMacro;
--- a/SOURCES/qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
+++ b/SOURCES/qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch
@ -0,0 +1,11 @@
+--- qtbase-opensource-src-5.8.0/src/corelib/global/qglobal.h.orig	2017-01-26 10:45:40.905010896 +0100
+++ qtbase-opensource-src-5.8.0/src/corelib/global/qglobal.h	2017-01-26 10:46:50.299858887 +0100
+@@ -55,7 +55,7 @@
+ /*
+    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+ 
+ #ifdef QT_BOOTSTRAPPED
+ #include <QtCore/qconfig-bootstrapped.h>
--- a/SOURCES/qtbase-opensource-src-5.9.0-mysql.patch
+++ b/SOURCES/qtbase-opensource-src-5.9.0-mysql.patch
@ -0,0 +1,12 @@
+diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
+--- qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than	2017-07-14 13:43:50.831203768 +0200
+++ qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h	2017-07-14 13:44:24.364948006 +0200
+@@ -58,6 +58,7 @@
+ #endif
+ 
+ #include <mysql.h>
+#include <mysql_version.h>
+ 
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_MYSQL
--- a/SOURCES/qtbase-qlibrary-do-not-attempt-to-load-library-relative-to-pwd.patch
+++ b/SOURCES/qtbase-qlibrary-do-not-attempt-to-load-library-relative-to-pwd.patch
@ -0,0 +1,52 @@
+From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Fri, 10 Jan 2020 09:26:27 -0800
+Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD
+
+I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to
+find libraries in a haswell/ subdir of the main path, but we only need
+to do that transformation if the library is contains at least one
+directory seprator. That is, if the user asks to load "lib/foo", then we
+should try "lib/haswell/foo" (often, the path prefix will be absolute).
+
+When the library name the user requested has no directory separators, we
+let dlopen() do the transformation for us. Testing on Linux confirms
+glibc does so:
+
+$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor
+   1972475:     find library=libXcursor.so.1 [0]; searching
+   1972475:       trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1
+   1972475:       trying file=/usr/lib64/haswell/libXcursor.so.1
+   1972475:       trying file=/usr/lib64/libXcursor.so.1
+   1972475:     calling init: /usr/lib64/libXcursor.so.1
+   1972475:     calling fini: /usr/lib64/libXcursor.so.1 [0]
+
+Fixes: QTBUG-81272
+Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/plugin/qlibrary_unix.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
+index e0381498..7cc7c8e3 100644
+--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
+@@ -1,7 +1,7 @@
+ /****************************************************************************
+ **
+ ** Copyright (C) 2016 The Qt Company Ltd.
+-** Copyright (C) 2018 Intel Corporation
+** Copyright (C) 2020 Intel Corporation
+ ** Contact: https://www.qt.io/licensing/
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -208,6 +208,8 @@ bool QLibraryPrivate::load_sys()
+         for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
+             if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix)))
+                 continue;
+            if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/')))
+                continue;
+             if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix)))
+                 continue;
+             if (loadHints & QLibrary::LoadArchiveMemberHint) {
--- a/SOURCES/qtbase-qmake_LFLAGS.patch
+++ b/SOURCES/qtbase-qmake_LFLAGS.patch
@ -0,0 +1,12 @@
+diff -up qtbase-everywhere-src-5.10.1/qmake/Makefile.unix.qmake_LFLAGS qtbase-everywhere-src-5.10.1/qmake/Makefile.unix
+--- qtbase-everywhere-src-5.10.1/qmake/Makefile.unix.qmake_LFLAGS	2018-02-08 12:24:48.000000000 -0600
+++ qtbase-everywhere-src-5.10.1/qmake/Makefile.unix	2018-02-15 10:25:07.077763061 -0600
+@@ -142,7 +142,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+ 	   -DQT_NO_FOREACH
+ 
+ CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
+-LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
+LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) $(QMAKE_LFLAGS_RELEASE)
+ 
+ first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
+ qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
--- a/SOURCES/qtlogging.ini
+++ b/SOURCES/qtlogging.ini
@ -0,0 +1,3 @@
+[Rules]
+*.debug=false
+qt.qpa.xcb.xcberror.warning=false
--- a/SOURCES/tell-the-truth-about-private-api.patch
+++ b/SOURCES/tell-the-truth-about-private-api.patch
@ -0,0 +1,16 @@
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index e6a0d97..cf93041 100644
+--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
+@@ -216,9 +216,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
+     QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
+
+     internal_module {
+-        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
+     } else {
+-        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
+                             "    qt_private_api_tag*;"
+
+         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
--- a/SOURCES/xcberror_filter.patch
+++ b/SOURCES/xcberror_filter.patch
@ -0,0 +1,41 @@
+From 911762e077c8b2f9795171c1e628942a0a979801 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Fri, 15 Dec 2017 11:56:12 +0100
+Subject: foo
+
+
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
+index 536c709..c6eb1b1 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -111,6 +111,8 @@ Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events")
+ Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen")
+ Q_LOGGING_CATEGORY(lcQpaEvents, "qt.qpa.events")
+ Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb") // for general (uncategorized) XCB logging
+Q_LOGGING_CATEGORY(lcQpaXcbError, "qt.qpa.xcb.xcberror")
+// TODO: How to categorize by xcberror type? (e.g. only BadWindow)
+ Q_LOGGING_CATEGORY(lcQpaPeeker, "qt.qpa.peeker")
+
+ // this event type was added in libxcb 1.10,
+@@ -964,7 +966,8 @@ void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
+     uint clamped_error_code = qMin<uint>(error->error_code, (sizeof(xcb_errors) / sizeof(xcb_errors[0])) - 1);
+     uint clamped_major_code = qMin<uint>(error->major_code, (sizeof(xcb_protocol_request_codes) / sizeof(xcb_protocol_request_codes[0])) - 1);
+
+-    qWarning("QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
+    qCWarning(lcQpaXcbError,
+           "QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
+            int(error->error_code), xcb_errors[clamped_error_code],
+            int(error->sequence), int(error->resource_id),
+            int(error->major_code), xcb_protocol_request_codes[clamped_major_code],
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
+index 999dc06..554611c 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
+@@ -91,6 +91,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaEvents)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb)
+Q_DECLARE_LOGGING_CATEGORY(lcQpaXcbError)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaPeeker)
+
+ class QXcbVirtualDesktop;
--- a/SPECS/qt5-qtbase.spec
+++ b/SPECS/qt5-qtbase.spec
				`@ -0,0 +1 @@`
				`47145a722a8a8457121071f60b4e44fc66c58979 SOURCES/qtbase-everywhere-src-5.12.5.tar.xz`