5.9.6

pull in opensuse patch for now

.gitignore

@@ -1,6 +1,2 @@
-/qtbase-everywhere-src-5.12.1.tar.xz
-/qtbase-everywhere-src-5.12.3.tar.xz
-/qtbase-everywhere-src-5.12.4.tar.xz
-/qtbase-everywhere-src-5.12.5.tar.xz
-/qtbase-everywhere-src-5.13.2.tar.xz
-/qtbase-everywhere-src-5.14.2.tar.xz
+/qtbase-opensource-src-5.9.4.tar.xz
+/qtbase-opensource-src-5.9.6.tar.xz

0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch

@@ -1,109 +0,0 @@
-From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Thu, 2 Apr 2020 12:08:41 -0300
-Subject: [PATCH 44/49] QLibrary: fix deadlock caused by fix to QTBUG-39642
-
-Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
-the entire load_sys(). We had reasoed that deadlocks would only occur if
-the object creation in instance() recursed into its own instance(),
-which was already a bug. But we had forgotten that dlopen()/
-LoadLibrary() executes initialization code from the module being loaded,
-which could cause a recursion back into the same QPluginLoader or
-QLibrary object. This recursion is benign because the module *is* loaded
-and dlopen()/LoadLibrary() returns the same handle.
-
-[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
-would happen if the plugin or library being loaded has load-time
-initialization code (C++ global variables) that recursed back into the
-same QLibrary or QPluginLoader object.
-
-PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
-lock, so pluginState should be made an atomic variable. Once that is
-done, we'll only need locking the mutex to update errorString (no
-locking before loading).
-
-Fixes: QTBUG-83207
-Task-number: QTBUG-39642
-Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/corelib/plugin/qlibrary.cpp      | 2 --
- src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
- src/corelib/plugin/qlibrary_win.cpp  | 3 +++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
-index ddb053c26f..be9d92b204 100644
---- a/src/corelib/plugin/qlibrary.cpp
-+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
- 
-     Q_TRACE(QLibraryPrivate_load_entry, fileName);
- 
--    mutex.lock();
-     bool ret = load_sys();
--    mutex.unlock();
-     if (qt_debug_component()) {
-         if (ret) {
-             qDebug() << "loaded library" << fileName;
-diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
-index 017aa97b66..a5c72f81d9 100644
---- a/src/corelib/plugin/qlibrary_unix.cpp
-+++ b/src/corelib/plugin/qlibrary_unix.cpp
-@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
- 
- bool QLibraryPrivate::load_sys()
- {
-+    QMutexLocker locker(&mutex);
-     QString attempt;
-     QFileSystemEntry fsEntry(fileName);
- 
-@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
-     }
- #endif
- 
-+    locker.unlock();
-     bool retry = true;
-     Handle hnd = nullptr;
-     for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
-@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
-         }
-     }
- #endif
-+
-+    locker.relock();
-     if (!hnd) {
-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
-     }
-diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
-index 000bf76276..ef58724be8 100644
---- a/src/corelib/plugin/qlibrary_win.cpp
-+++ b/src/corelib/plugin/qlibrary_win.cpp
-@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
-     //     fileName
-     //
-     // NB If it's a plugin we do not ever try the ".dll" extension
-+    QMutexLocker locker(&mutex);
-     QStringList attempts;
- 
-     if (pluginState != IsAPlugin)
-@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
-         attempts.prepend(QDir::rootPath() + fileName);
- #endif
- 
-+    locker.unlock();
-     Handle hnd = nullptr;
-     for (const QString &attempt : qAsConst(attempts)) {
- #ifndef Q_OS_WINRT
-@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
- #ifndef Q_OS_WINRT
-     SetErrorMode(oldmode);
- #endif
-+    locker.relock();
-     if (!hnd) {
-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(
-                     QDir::toNativeSeparators(fileName), qt_error_string());
--- 
-2.25.2
-

qt5-qtbase-5.12.1-firebird.patch

@@ -1,29 +0,0 @@
-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

qt5-qtbase-5.9.1-firebird.patch

@@ -0,0 +1,32 @@
+diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
+index 234f880..7b13671 100644
+--- a/src/plugins/sqldrivers/configure.json
++++ b/src/plugins/sqldrivers/configure.json
+@@ -50,11 +50,12 @@
+         "ibase": {
+             "label": "InterBase",
+             "test": {
+-                "include": "ibase.h"
++                "include": "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 --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+index c7cee41..6a9c56c 100644
+--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
++++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+@@ -52,7 +52,7 @@
+ //
+
+ #include <QtSql/qsqldriver.h>
+-#include <ibase.h>
++#include <firebird/ibase.h>
+
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_IBASE

qt5-qtbase-CVE-2015-9541.patch

@@ -1,146 +0,0 @@
-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 v0.2.1

qt5-qtbase.spec

@@ -8,19 +8,6 @@
 %endif
 %global openssl -openssl-linked
 
-%if 0%{?fedora} < 29
-%ifarch %{ix86}
-%global no_sse2  -no-sse2
-%endif
-%endif
-
-# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1668865
-# for current stable releases
-%if 0%{?fedora} && 0%{?fedora} < 30
-%global no_feature_statx -no-feature-statx
-%global no_feature_renameat2 -no-feature-renameat2
-%endif
-
 # support qtchooser (adds qtchooser .conf file)
 %global qtchooser 1
 %if 0%{?qtchooser}
@@ -40,26 +27,40 @@
 
 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
+%if 0%{?fedora} > 21
 # use external qt_settings pkg
 %global qt_settings 1
+%endif
 
+# See http://bugzilla.redhat.com/1279265
+%if 0%{?fedora} < 24
+%global inject_optflags 1
+%endif
+
+%if 0%{?fedora} > 23 || 0%{?rhel} > 6
 %global journald -journald
 BuildRequires: pkgconfig(libsystemd)
+%endif
+
+%if 0%{?fedora} > 23
+# gcc6: FTBFS
+%global qt5_deprecated_flag -Wno-deprecated-declarations
+# gcc6: Qt assumes this in places
+%global qt5_null_flag -fno-delete-null-pointer-checks
+%endif
 
 %global examples 1
-## skip for now, until we're better at it --rex
-#global tests 1
+%global tests 1
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.14.2
-Release: 4%{?dist}
+Version: 5.9.6
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://qt-project.org/
-%global  majmin %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
 Source1: qtlogging.ini
@@ -78,11 +79,8 @@ Source10: macros.qt5-qtbase
 # support multilib optflags
 Patch2: qtbase-multilib_optflags.patch
 
-# borrowed from opensuse
-# track private api via properly versioned symbols
-# downside: binaries produced with these differently-versioned symbols are no longer
-# compatible with qt-project.org's Qt binary releases.
-Patch8: tell-the-truth-about-private-api.patch
+# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
+Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
 
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@@ -99,37 +97,32 @@ Patch51: qtbase-hidpi_scale_at_192.patch
 # 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
 Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
 
-# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
-# https://bugzilla.redhat.com/1704474
-Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
-
-# respect QMAKE_LFLAGS_RELEASE when building qmake
-Patch54: qtbase-qmake_LFLAGS.patch
-
-# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
-Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch
+# QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream
+# This leads to an automatically appended .bin when saving a file.
+# https://bugs.freedesktop.org/show_bug.cgi?id=101667
+# https://bugs.kde.org/382437
+# Fixed upstream in shared-mime-info 1.10
+Patch53: qtbase-fdo101667.patch
 
 # drop -O3 and make -O2 by default
 Patch61: qt5-qtbase-cxxflag.patch
 
+# backport from upstream
+Patch63: qt5-qtbase-5.9.1-openssl11.patch
+
 # support firebird version 3.x
-Patch64: qt5-qtbase-5.12.1-firebird.patch
+Patch64: qt5-qtbase-5.9.1-firebird.patch
 
 # fix for new mariadb
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
+Patch66: qtbase-mariadb.patch
 
-# python3
-Patch68: qtbase-everywhere-src-5.11.1-python3.patch
+# use categorized logging for xcb log entries
+# https://bugreports.qt.io/browse/QTBUG-55167
+# https://bugzilla.redhat.com/show_bug.cgi?id=1497564
+Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch
 
-# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
-# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
-Patch80: qtbase-use-wayland-on-gnome.patch
-
-# glibc stat
-
-## upstream patches
-Patch100: qt5-qtbase-CVE-2015-9541.patch
-Patch144: 0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
+## upstream patches (5.9 branch)
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -144,15 +137,11 @@ BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: findutils
 BuildRequires: libjpeg-devel
-BuildRequires: libmng-devel
-BuildRequires: libtiff-devel
 BuildRequires: pkgconfig(alsa)
 # required for -accessibility
 BuildRequires: pkgconfig(atspi-2)
 %if 0%{?use_clang}
 BuildRequires: clang >= 3.7.0
-%else
-BuildRequires: gcc-c++
 %endif
 # http://bugzilla.redhat.com/1196359
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -176,7 +165,7 @@ BuildRequires: openssl-devel%{?openssl11: >= 1.1}
 %endif
 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
 %if 0%{?fedora}
-#global xkbcommon -system-xkbcommon
+%global xkbcommon -system-xkbcommon
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
@@ -186,19 +175,15 @@ BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
 %if 0%{?rhel} == 6
 %global xcb -qt-xcb
 %endif
-#global xkbcommon -qt-xkbcommon
+%global xkbcommon -qt-xkbcommon
 Provides: bundled(libxkbcommon) = 0.4.1
 %endif
 BuildRequires: pkgconfig(xkeyboard-config)
 %if 0%{?fedora} || 0%{?rhel} > 6
 %global egl 1
-BuildRequires: libEGL-devel
+BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gbm)
-## TODO: apparently only needed if building opengl_es2 support, do we actually use it?  -- rex
-## this dep was removed in rawhide with introduction of mesa-19.1
-%if 0%{?fedora} < 30
 BuildRequires: pkgconfig(glesv2)
-%endif
 %global sqlite -system-sqlite
 BuildRequires: pkgconfig(sqlite3) >= 3.7
 %if 0%{?fedora} > 22
@@ -217,9 +202,7 @@ BuildRequires: libicu-devel
 BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
 BuildRequires: pkgconfig(zlib)
 BuildRequires: perl-generators
-# see patch68
-BuildRequires: python3
-BuildRequires: qt5-rpm-macros
+BuildRequires: qt5-rpm-macros >= 5.7.1
 
 %if 0%{?tests}
 BuildRequires: dbus-x11
@@ -246,12 +229,12 @@ Requires: %{name}-common = %{version}-%{release}
 %global tds -no-sql-tds
 %endif
 
-# workaround gold linker bug(s) by not using it
+# workaround gold linker bug by not using it
 # https://bugzilla.redhat.com/1458003
 # https://sourceware.org/bugzilla/show_bug.cgi?id=21074
-# reportedly fixed or worked-around, re-enable if there's evidence of problems -- rex
-# https://bugzilla.redhat.com/show_bug.cgi?id=1635973
+%if 0%{?fedora} > 26
 %global use_gold_linker -no-use-gold-linker
+%endif
 
 %description
 Qt is a software toolkit for developing applications.
@@ -271,29 +254,20 @@ BuildArch: noarch
 
 %package devel
 Summary: Development files for %{name}
+Provides: %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-gui%{?_isa}
 %if 0%{?egl}
-Requires: libEGL-devel
+Requires: pkgconfig(egl)
 %endif
 Requires: pkgconfig(gl)
-Requires: qt5-rpm-macros
+Requires: qt5-rpm-macros >= 5.7.1
 %if 0%{?use_clang}
 Requires: clang >= 3.7.0
 %endif
 %description devel
 %{summary}.
 
-%package private-devel
-Summary: Development files for %{name} private APIs
-# upgrade path, when private-devel was introduced
-Obsoletes: %{name}-devel < 5.12.1-3
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-# QtPrintSupport/private requires cups/ppd.h
-Requires: cups-devel
-%description private-devel
-%{summary}.
-
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -344,7 +318,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %package postgresql
 Summary: PostgreSQL driver for Qt5's SQL classes
-BuildRequires: libpq-devel
+BuildRequires: postgresql-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description postgresql
 %{summary}.
@@ -375,34 +349,44 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 
 
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%setup -q -n %{qt_module}-opensource-src-%{version}
 
 ## upstream fixes
-
-# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
-%patch8 -p1
+%patch4 -p1 -b .QTBUG-35459
 
 %patch50 -p1 -b .QT_VERSION_CHECK
-# FIXME/TODO : rebase or drop -- rdieter
-#patch51 -p1 -b .hidpi_scale_at_192
+%patch51 -p1 -b .hidpi_scale_at_192
 %patch52 -p1 -b .moc_macros
-%patch53 -p1 -b .qt5gui_cmake_isystem_includes
-%patch54 -p1 -b .qmake_LFLAGS
-%patch55 -p1 -b .no_relocatable
+%patch53 -p1 -b .fdo101667
 %patch61 -p1 -b .qt5-qtbase-cxxflag
+%if 0%{?openssl11}
+%patch63 -p1 -b .openssl11
+%endif
 %patch64 -p1 -b .firebird
 %if 0%{?fedora} > 27
 %patch65 -p1 -b .mysql
 %endif
-%patch68 -p1
-
-%if 0%{?fedora} > 30
-%patch80 -p1 -b .use-wayland-on-gnome.patch
-%endif
+%patch66 -p1 -b .mariadb
+%patch67 -p1 -b .xcberror_filter
 
 ## upstream patches
-%patch100 -p1 -b .CVE-2015-9541
-%patch144 -p1 -b .0044
+
+%if 0%{?inject_optflags}
+## adjust $RPM_OPT_FLAGS
+
+%patch2 -p1 -b .multilib_optflags
+# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
+rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
+
+sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" \
+  mkspecs/%{platform}/qmake.conf
+
+sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $RPM_LD_FLAGS|" \
+  mkspecs/common/g++-unix.conf
+
+# undefine QMAKE_STRIP (and friends), so we get useful -debuginfo pkgs (#1065636)
+sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf
+%endif
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -427,6 +411,10 @@ sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \
  bin/syncqt.pl \
  mkspecs/features/data/unix/findclasslist.pl
 
+# Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
+sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i \
+  mkspecs/features/create_cmake.prf
+
 
 %build
 ## FIXME/TODO:
@@ -482,7 +470,9 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -no-pch \
   -no-rpath \
   -no-separate-debug-info \
-  %{?no_sse2} \
+%ifarch %{ix86}
+  -no-sse2 \
+%endif
   -no-strip \
   -system-libjpeg \
   -system-libpng \
@@ -495,22 +485,21 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -system-zlib \
   %{?use_gold_linker} \
   -no-directfb \
-  -no-feature-relocatable \
-  %{?no_feature_renameat2} \
-  %{?no_feature_statx} \
   QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
 
+%if ! 0%{?inject_optflags}
 # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
 make clean -C qmake
-%make_build -C qmake all binary \
+make %{?_smp_mflags} -C qmake \
   QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" \
   QMAKE_STRIP=
+%endif
 
-%make_build
+make %{?_smp_mflags}
 
 
 %install
@@ -540,7 +529,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: %{version}
+Version: 5.9.4
 EOF
 
 # rpm macros
@@ -584,7 +573,6 @@ popd
   mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser
   pushd    %{buildroot}%{_sysconfdir}/xdg/qtchooser
   echo "%{_qt5_bindir}" >  5-%{__isa_bits}.conf
-## FIXME/TODO: verify qtchooser (still) happy if _qt5_prefix uses %%_prefix instead of %%_libdir/qt5
   echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf
   # alternatives targets
   touch default.conf 5.conf
@@ -605,8 +593,6 @@ popd
 
 install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh
 
-# f29+ enables sse2 unconditionally on ix86 -- rex
-%if 0%{?fedora} < 29
 # fix bz#1442553 multilib issue
 privat_header_file=%{buildroot}%{_qt5_headerdir}/QtCore/%{version}/QtCore/private/qconfig_p.h
 grep -v QT_FEATURE_sse2 $privat_header_file > ${privat_header_file}.me
@@ -618,17 +604,12 @@ cat >>${privat_header_file}<<EOF
 #define QT_FEATURE_sse2 -1
 #endif
 EOF
-%endif
 
 # install privat headers for qtxcb
 mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
 install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt5_headerdir}/QtXcb/
 
-
 %check
-# verify Qt5.pc
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-test "$(pkg-config --modversion Qt5)" = "%{version}"
 %if 0%{?tests}
 ## see tests/README for expected environment (running a plasma session essentially)
 ## we are not quite there yet
@@ -637,7 +618,7 @@ export PATH=%{buildroot}%{_qt5_bindir}:$PATH
 export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
 # dbus tests error out when building if session bus is not available
 dbus-launch --exit-with-session \
-%make_build sub-tests  -k ||:
+make sub-tests %{?_smp_mflags} -k ||:
 xvfb-run -a --server-args="-screen 0 1280x1024x32" \
 dbus-launch --exit-with-session \
 time \
@@ -660,7 +641,7 @@ fi
 %endif
 
 %post
-%{?ldconfig}
+/sbin/ldconfig
 %if 0%{?qtchooser}
 %{_sbindir}/update-alternatives \
   --install %{_sysconfdir}/xdg/qtchooser/5.conf \
@@ -676,7 +657,7 @@ fi
 %endif
 
 %postun
-%{?ldconfig}
+/sbin/ldconfig
 %if 0%{?qtchooser}
 if [ $1 -eq 0 ]; then
 %{_sbindir}/update-alternatives  \
@@ -690,9 +671,8 @@ fi
 %endif
 
 %files
-%license LICENSE.FDL
-%license LICENSE.GPL*
-%license LICENSE.LGPL*
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.LGPL* LGPL_EXCEPTION.txt LICENSE.FDL
 %if 0%{?qtchooser}
 %dir %{_sysconfdir}/xdg/qtchooser
 # not editable config files, so not using %%config here
@@ -708,6 +688,7 @@ fi
 %{_qt5_libdir}/libQt5Sql.so.5*
 %{_qt5_libdir}/libQt5Test.so.5*
 %{_qt5_libdir}/libQt5Xml.so.5*
+%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so.5*
 %dir %{_qt5_libdir}/cmake/
 %dir %{_qt5_libdir}/cmake/Qt5/
 %dir %{_qt5_libdir}/cmake/Qt5Concurrent/
@@ -723,13 +704,9 @@ fi
 %dir %{_qt5_libdir}/cmake/Qt5Xml/
 %dir %{_qt5_docdir}/
 %{_qt5_docdir}/global/
-%{_qt5_docdir}/config/
 %{_qt5_importdir}/
 %{_qt5_translationdir}/
-%if "%{_qt5_prefix}" != "%{_prefix}"
 %dir %{_qt5_prefix}/
-%endif
-%dir %{_qt5_archdatadir}/
 %dir %{_qt5_datadir}/
 %{_qt5_datadir}/qtlogging.ini
 %dir %{_qt5_libexecdir}/
@@ -772,8 +749,6 @@ fi
 %{_bindir}/uic*
 %{_bindir}/qlalr
 %{_bindir}/fixqt4headers.pl
-%{_bindir}/qvkgen
-%{_bindir}/tracegen
 %{_qt5_bindir}/moc*
 %{_qt5_bindir}/qdbuscpp2xml*
 %{_qt5_bindir}/qdbusxml2cpp*
@@ -783,7 +758,6 @@ fi
 %{_qt5_bindir}/uic*
 %{_qt5_bindir}/qlalr
 %{_qt5_bindir}/fixqt4headers.pl
-%{_qt5_bindir}/qvkgen
 %if "%{_qt5_headerdir}" != "%{_includedir}"
 %dir %{_qt5_headerdir}
 %endif
@@ -802,8 +776,6 @@ fi
 %{_qt5_headerdir}/QtXml/
 %{_qt5_headerdir}/QtEglFSDeviceIntegration
 %{_qt5_headerdir}/QtInputSupport
-%{_qt5_headerdir}/QtEdidSupport
-%{_qt5_headerdir}/QtXkbCommonSupport
 %{_qt5_archdatadir}/mkspecs/
 %{_qt5_libdir}/libQt5Concurrent.prl
 %{_qt5_libdir}/libQt5Concurrent.so
@@ -848,25 +820,6 @@ fi
 %{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
 %{_qt5_libdir}/cmake/Qt5Xml/Qt5XmlConfig*.cmake
 %{_qt5_libdir}/cmake/Qt5/Qt5ModuleLocation.cmake
-%{_qt5_libdir}/cmake/Qt5AccessibilitySupport/Qt5AccessibilitySupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5Bootstrap/Qt5BootstrapConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5EdidSupport/Qt5EdidSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5EglFSDeviceIntegration/Qt5EglFSDeviceIntegrationConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5EglFsKmsSupport/Qt5EglFsKmsSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5EglSupport/Qt5EglSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5EventDispatcherSupport/Qt5EventDispatcherSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5FbSupport/Qt5FbSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5GlxSupport/Qt5GlxSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5InputSupport/Qt5InputSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5KmsSupport/Qt5KmsSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5PlatformCompositorSupport/Qt5PlatformCompositorSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5ServiceSupport/Qt5ServiceSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5ThemeSupport/Qt5ThemeSupportConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5XcbQpa/Qt5XcbQpaConfig*.cmake
-%{_qt5_libdir}/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5.pc
 %{_qt5_libdir}/pkgconfig/Qt5Concurrent.pc
 %{_qt5_libdir}/pkgconfig/Qt5Core.pc
@@ -883,15 +836,7 @@ fi
 %{_qt5_libdir}/libQt5EglFsKmsSupport.prl
 %{_qt5_libdir}/libQt5EglFsKmsSupport.so
 %endif
-%{_qt5_libdir}/qt5/bin/tracegen
-## private-devel globs
-# keep mkspecs/modules stuff  in -devel for now, https://bugzilla.redhat.com/show_bug.cgi?id=1705280
-%{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
-%exclude %{_qt5_headerdir}/*/%{version}/*/private/
 
-%files private-devel
-%{_qt5_headerdir}/*/%{version}/*/private/
-#{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
 
 %files static
 %{_qt5_libdir}/libQt5Bootstrap.*a
@@ -939,10 +884,6 @@ fi
 %{_qt5_libdir}/libQt5KmsSupport.*a
 %{_qt5_libdir}/libQt5KmsSupport.prl
 %{_qt5_headerdir}/QtKmsSupport
-%{_qt5_libdir}/libQt5EdidSupport.*a
-%{_qt5_libdir}/libQt5EdidSupport.prl
-%{_qt5_libdir}/libQt5XkbCommonSupport.*a
-%{_qt5_libdir}/libQt5XkbCommonSupport.prl
 
 %if 0%{?examples}
 %files examples
@@ -973,7 +914,8 @@ fi
 %{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake
 %endif
 
-%ldconfig_scriptlets gui
+%post gui -p /sbin/ldconfig
+%postun gui -p /sbin/ldconfig
 
 %files gui
 %dir %{_sysconfdir}/X11/xinit
@@ -1009,7 +951,6 @@ fi
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
 %if 0%{?egl}
-%{_qt5_libdir}/libQt5EglFSDeviceIntegration.so.5*
 %{_qt5_libdir}/libQt5EglFsKmsSupport.so.5*
 %{_qt5_plugindir}/platforms/libqeglfs.so
 %{_qt5_plugindir}/platforms/libqminimalegl.so
@@ -1039,203 +980,33 @@ fi
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 %{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
-%{_qt5_plugindir}/platformthemes/libqxdgdesktopportal.so
 %{_qt5_plugindir}/platformthemes/libqgtk3.so
-%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
 %{_qt5_plugindir}/printsupport/libcupsprintersupport.so
 %{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
 
 
 %changelog
-* Tue Apr 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-4
-- backport "Mutex deadlock in QPluginLoader, Krita fails to start" (QTBUG-83207)
+* Mon Jun 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.6-1
+- 5.9.6
 
-* Mon Apr 13 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-3
-- %%build: -no-feature-relocatable + matching patch (#1823118)
+* Thu Feb 22 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-6
+- use upstreamed version of QOpenGLShaderProgram fix (QTBUG-66420)
 
-* Wed Apr 08 2020 Than Ngo <than@redhat.com> - 5.14.2-2
-- Fixed bz#1801370 - CVE-2015-9541 XML entity expansion vulnerability via a crafted SVG document
-
-* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
-- 5.14.2
-
-* Sun Mar 22 2020 Robert-André Mauchin <zebob.m@gmail.com> - 5.13.2-4
-- Upstream patch to add support for PostgreSQL 12 (#1815921)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 20 2020 Than Ngo <than@redhat.com> - 5.13.2-2
-- upstream patches fix following issues:
-    Do-not-load-plugin-from-the-PWD
-    QLibrary-Unix-do-not-attempt-to-load-a-library-relat
-
-* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
-- 5.13.2
-
-* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 5.12.5-2
-- Rebuild for ICU 65
-
-* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
-- 5.12.5
-
-* Wed Aug 21 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-7
-- s/pkgconfig(egl)/libEGL-devel/
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-5
-- Use qtwayland by default on Gnome Wayland sessions
-  Resolves: bz#1732129
-
-* Mon Jul 15 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-4
-- Revert "Reset QWidget's winId when backing window surface is destroyed"
-
-* Fri Jun 28 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-3
-- omit QTBUG-73231 patch fix, appears to introduce incompatible symbols
-
-* Wed Jun 26 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-2
-- pull in some upstream crash fixes
-
-* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
-- 5.12.4
-
-* Wed Jun 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.3-2
-- pull in candidate upstream nvidia/optima fix (kde#406180)
-
-* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
-- 5.12.3
-
-* Fri May 10 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-7
-- Fix install targets for generated private headers (#1702858)
-
-* Wed May 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-6
-- Blacklist nouveau and llvmpipe for multithreading (#1706420)
-- drop BR: pkgconfig(glesv2) on f31+, no longer provided in mesa-19.1+
-
-* Thu May 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-5
-- keep mkspecs/modules/*_private.pri in -devel #1705280)
-
-* Tue Apr 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-4
-- CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui (#1704474)
-
-* Tue Apr 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-3
-- -private-devel subpkg, move Requires: cups-devel here
-
-* Mon Mar 04 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-2
-- -devel: Requires: cups-devel
-
-* Thu Feb 14 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
-- 5.12.1
-
-* Wed Feb 13 2019 Than Ngo <than@redhat.com> - 5.11.3-4
-- fixed build issue with gcc9
-
-* Sun Feb 03 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-3
-- disable renameat2/statx feature on < f30 (#1668865)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
-- 5.11.3
-
-* Thu Oct 25 2018 Than Ngo <than@redhat.com> - 5.11.2-3
-- backported patch to fix selection rendering issues if rounding leads to left-out pixels
-- backported patch to optimize insertionPointsForLine
-
-* Thu Oct 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.2-2
-- -no-use-gold-linker (#1635973)
-
-
-* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
-- 5.11.2
-
-* Thu Jul 26 2018 Than Ngo <than@redhat.com> - 5.11.1-7
-- fixed FTBFS
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.11.1-5
-- Rebuild for ICU 62
-
-* Mon Jul 02 2018 Than Ngo <than@redhat.com> - 5.11.1-4
-- fixed bz#1597110 - BRP mangle shebangs and calculation of provides should ignore backups files
-
-* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-3
-- apply sse2-related multilib hack on < f29 only
-- safer %%_qt5_prefix, %%qt5_archdatadir ownership
-- rebuild for %%_qt5_prefix = %%_prefix
-
-* Sat Jun 23 2018 Than Ngo <than@redhat.com> - 5.11.1-2
-- fixed #1592146, python3
-
-* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
-- 5.11.1
-- relax qt5-rpm-macros dep
-- drop workaround for QTBUG-37417
-- drop CMake-Restore-qt5_use_modules-function.patch (upstreamed)
-
-* Mon Jun 18 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-3
-- backport CMake-Restore-qt5_use_modules-function.patch
-- %%build: %%ix86 --no-sse2 on < f29 only
-
-* Wed May 30 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-2
-- move libQt5EglFSDeviceIntegration to -gui (#1557223)
-
-* Tue May 22 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
-- 5.11.0
-- drop support for inject_optflags (not used since f23)
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 5.10.1-8
-- Rebuild for ICU 61.1
-
-* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-7
-- enforce qt5-rpm-macros versioning
-- BR: gcc-c++
-- Qt5.pc: fix version, add %%check
-
-* Fri Feb 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-6
-- qt5-qtbase: RPM build flags only partially injected (#1543888)
-
-* Wed Feb 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-5
+* Wed Feb 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-5
 - QOpenGLShaderProgram: glProgramBinary() resulting in LINK_STATUS=FALSE not handled properly (QTBUG-66420)
 
-* Fri Feb 16 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-4
-- use %%make_build, %%ldconfig
-- drop %%_licensedir hack
+* Tue Feb 13 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-4
+- omit 0068-QHeaderView.patch, reports of regression'y behavior
 
-* Thu Feb 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3
-- qt5-qtbase: RPM build flags only partially injected (#1543888)
+* Fri Feb 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-3
+- 5.9 branch fixes
 
-* Tue Feb 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-2
-- enable patch to track private api
-
-* Tue Feb 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
-- 5.10.1
-
-* Fri Feb 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-5
-- track private api use via properly versioned symbols (unused for now)
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.10.0-4
-- Escape macros in %%changelog
-
-* Sun Jan 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-3
+* Sun Jan 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-2
 - QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream (fdo#101667,kde#382437)
 
-* Fri Jan 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-2
-- re-enable gold linker (#1458003)
-- drop qt5_null_flag/qt5_deprecated_flag hacks (should be fixed upstream for awhile)
-- make qt_settings/journald support unconditional
-
-* Fri Dec 15 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
-- 5.10.0
-
-* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 5.9.3-3
-- Rebuild for ICU 60.1
+* Tue Jan 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
+- 5.9.4
 
 * Thu Nov 30 2017 Than Ngo <than@redhat.com> - 5.9.3-2
 - bz#1518958, backport to fix out of bounds reads in qdnslookup_unix
@@ -1570,7 +1341,7 @@ fi
 - Crash in QXcbWindow::setParent() due to NULL xcbScreen (QTBUG-50081, #1291003)
 
 * Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.17.beta
-- fix/update Release: 1%%{?dist}
+- fix/update Release: 1%{?dist}
 
 * Fri Dec 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.16
 - 5.6.0-beta (final)

qtbase-everywhere-src-5.11.1-python3.patch

@@ -1,9 +0,0 @@
-diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me	2018-06-23 11:29:21.750066271 +0200
-+++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py	2018-06-23 11:30:07.457292033 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- 
- #############################################################################
- ##

qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch

@@ -1,14 +0,0 @@
-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)
- 

qtbase-everywhere-src-5.14.2-no_relocatable.patch

@@ -1,16 +0,0 @@
-diff -up qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp
---- qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable	2020-03-27 04:49:31.000000000 -0500
-+++ qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp	2020-04-13 15:13:44.075705226 -0500
-@@ -671,8 +671,11 @@ static QString getPrefix(
- #  if QT_CONFIGURE_CROSSBUILD
-     if (group == QLibraryInfo::DevicePaths)
-         return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
--#  endif
-+#  elif 0 //QT_CONFIG(relocatable)
-     return getExtPrefixFromHostBinDir();
-+#  else
-+    return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
-+#  endif
- #elif QT_CONFIG(relocatable)
-     return getRelocatablePrefix();
- #else

qtbase-fdo101667.patch

@@ -0,0 +1,12 @@
+diff -up qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp.fdo101667 qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp
+--- qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp.fdo101667	2018-01-16 00:53:43.000000000 -0600
++++ qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp	2018-01-28 07:18:09.502534397 -0600
+@@ -418,6 +418,8 @@ QStringList QMimeType::suffixes() const
+  */
+ QString QMimeType::preferredSuffix() const
+ {
++    if (isDefault()) // workaround for unwanted *.bin suffix for octet-stream, https://bugs.freedesktop.org/show_bug.cgi?id=101667, fixed upstream in 1.10 
++        return QString();
+     const QStringList suffixList = suffixes();
+     return suffixList.isEmpty() ? QString() : suffixList.at(0);
+ }

qtbase-hidpi_scale_at_192.patch

@@ -1,12 +1,13 @@
-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();
+diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
+index 5e136b5..0ad2842 100644
+--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
++++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
+@@ -620,7 +620,7 @@ void QXcbScreen::updateGeometry(const QRect &geom, uint8_t rotation)
+         m_sizeMillimeters = sizeInMillimeters(xGeometry.size(), virtualDpi());
+
+     qreal dpi = xGeometry.width() / physicalSize().width() * qreal(25.4);
+-    m_pixelDensity = qMax(1, qRound(dpi/96));
++    m_pixelDensity = qMax(1, (int) (dpi/96)); // instead of rounding at 1.5, round at 2.0 (same as GNOME)
+     m_geometry = QRect(xGeometry.topLeft(), xGeometry.size());
+     m_availableGeometry = xGeometry & m_virtualDesktop->workArea();
      QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);

qtbase-mariadb.patch

@@ -0,0 +1,20 @@
+diff -up qtbase-opensource-src-5.9.6/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.mariadb qtbase-opensource-src-5.9.6/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+--- qtbase-opensource-src-5.9.6/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.mariadb	2018-06-11 10:03:46.720013031 -0500
++++ qtbase-opensource-src-5.9.6/src/plugins/sqldrivers/mysql/qsql_mysql.cpp	2018-06-11 10:13:52.285354880 -0500
+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ 
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+     qAddPostRoutine([]() { mysql_server_end(); });
+ #endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ #  if MYSQL_VERSION_ID > 40000
+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003

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();

qtbase-qmake_LFLAGS.patch

@@ -1,12 +0,0 @@
-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)

qtbase-use-wayland-on-gnome.patch

@@ -1,20 +0,0 @@
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index b8bfad4f16..676fdfad5e 100644
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -1376,14 +1376,7 @@ void QGuiApplicationPrivate::createPlatformIntegration()
-         if (sessionType == QByteArrayLiteral("x11") && !platformName.contains(QByteArrayLiteral("xcb"))) {
-             platformName = QByteArrayLiteral("xcb");
-         } else if (sessionType == QByteArrayLiteral("wayland") && !platformName.contains(QByteArrayLiteral("wayland"))) {
--            QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower();
--            QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower();
--            if (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome")) {
--                qInfo() << "Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome."
--                        << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway.";
--            } else {
--                platformName = QByteArrayLiteral("wayland");
--            }
-+            platformName = QByteArrayLiteral("wayland");
-         }
-     }
- #ifdef QT_QPA_DEFAULT_PLATFORM_NAME

sources

@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-5.14.2.tar.xz) = 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+SHA512 (qtbase-opensource-src-5.9.6.tar.xz) = e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb

sources.basename

@@ -1 +0,0 @@
-qtbase-everywhere-src

tell-the-truth-about-private-api.patch

@@ -1,16 +0,0 @@
-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

xcberror_filter.patch

@@ -0,0 +1,58 @@
+--- qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb/qxcbconnection.cpp	2016-12-01 02:17:04.000000000 -0600
++++ qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb.new/qxcbconnection.cpp	2017-09-20 15:41:47.057359162 -0500
+@@ -109,6 +109,9 @@
+ Q_LOGGING_CATEGORY(lcQpaXInputDevices, "qt.qpa.input.devices")
+ Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events")
+ Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen")
++Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb")
++Q_LOGGING_CATEGORY(lcQpaXcbError, "qt.qpa.xcb.xcberror")
++// TODO: How to categorize by xcberror type? (e.g. only BadWindow)
+ 
+ // this event type was added in libxcb 1.10,
+ // but we support also older version
+@@ -996,7 +999,9 @@
+     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",
++    //TODO: Make the category filterable based on the XCB Error
++    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],
+@@ -1006,19 +1011,19 @@
+     int i = 0;
+     for (; i < m_callLog.size(); ++i) {
+         if (m_callLog.at(i).sequence == error->sequence) {
+-            qDebug("Caused by: %s:%d", m_callLog.at(i).file.constData(), m_callLog.at(i).line);
++            qCDebug(lcQpaXcbError, "Caused by: %s:%d", m_callLog.at(i).file.constData(), m_callLog.at(i).line);
+             break;
+         } else if (m_callLog.at(i).sequence > error->sequence) {
+-            qDebug("Caused some time before: %s:%d", m_callLog.at(i).file.constData(),
++            qCDebug(lcQpaXcbError, "Caused some time before: %s:%d", m_callLog.at(i).file.constData(),
+                    m_callLog.at(i).line);
+             if (i > 0)
+-                qDebug("and after: %s:%d", m_callLog.at(i-1).file.constData(),
++                qCDebug(lcQpaXcbError, "and after: %s:%d", m_callLog.at(i-1).file.constData(),
+                        m_callLog.at(i-1).line);
+             break;
+         }
+     }
+     if (i == m_callLog.size() && !m_callLog.isEmpty())
+-        qDebug("Caused some time after: %s:%d", qAsConst(m_callLog).first().file.constData(),
++        qCDebug(lcQpaXcbError, "Caused some time after: %s:%d", qAsConst(m_callLog).first().file.constData(),
+                qAsConst(m_callLog).first().line);
+ #endif
+ }
+--- qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb/qxcbconnection.h	2016-12-01 02:17:04.000000000 -0600
++++ qtbase-opensource-src-5.7.1/src/plugins/platforms/xcb.new/qxcbconnection.h	2017-09-20 15:35:55.655555316 -0500
+@@ -87,6 +87,8 @@
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputDevices)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents)
+ Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen)
++Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb)
++Q_DECLARE_LOGGING_CATEGORY(lcQpaXcbError)
+ 
+ class QXcbVirtualDesktop;
+ class QXcbScreen;