Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -1,6 +1,21 @@
-/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-everywhere-src-5.15.2.tar.xz
+/kde-5.15-rollup-20211124.patch.gz
+/kde-5.15-rollup-20211206.patch.gz
+/kde-5.15-rollup-20220107.patch.gz
+/kde-5.15-rollup-20220131.patch.gz
+/qtbase-everywhere-opensource-src-5.15.3.tar.xz
+/kde-5.15-rollup-20220304.patch.gz
+/qtbase-everywhere-opensource-src-5.15.4.tar.xz
+/kde-5.15-rollup-20220516.patch.gz
+/qtbase-everywhere-opensource-src-5.15.5.tar.xz
+/kde-5.15-rollup-20220713.patch.gz
+/kde-5.15-rollup-20220824.patch.gz
+/qtbase-everywhere-opensource-src-5.15.6.tar.xz
+/kde-5.15-rollup-20220920.patch.gz
+/qtbase-everywhere-opensource-src-5.15.7.tar.xz
+/kde-5.15-rollup-20221031.patch.gz
+/qtbase-everywhere-opensource-src-5.15.8.tar.xz
+/kde-5.15-rollup-20230105.patch.gz
+/kde-5.15-rollup-20230227.patch.gz
+/qtbase-everywhere-opensource-src-5.15.9.tar.xz
+/kde-5.15-rollup-20230411.patch.gz

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
-

pthread-riscv64.patch

@@ -0,0 +1,213 @@
+diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
+index 7f620a95..21267325 100644
+--- a/mkspecs/aix-g++-64/qmake.conf
++++ b/mkspecs/aix-g++-64/qmake.conf
+@@ -62,7 +62,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lm
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthreads
++QMAKE_LIBS_THREAD       = -pthreads
+ 
+ QMAKE_AR                = ar -X64 cq
+ QMAKE_OBJCOPY           = objcopy
+diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
+index d2f26a1b..2183bf37 100644
+--- a/mkspecs/aix-g++/qmake.conf
++++ b/mkspecs/aix-g++/qmake.conf
+@@ -62,7 +62,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lm
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthreads
++QMAKE_LIBS_THREAD       = -pthreads
+ 
+ QMAKE_AR                = ar cqs
+ QMAKE_OBJCOPY           = objcopy
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 544cc227..add969be 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL          = -lEGL
+ QMAKE_LIBS_OPENGL       = -lGL
+ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lOpenVG
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ QMAKE_LIBS_VULKAN       =
+ 
+ QMAKE_INCDIR_WAYLAND    =
+diff --git a/mkspecs/common/solaris.conf b/mkspecs/common/solaris.conf
+index d2176628..1c9ae6ef 100644
+--- a/mkspecs/common/solaris.conf
++++ b/mkspecs/common/solaris.conf
+@@ -21,7 +21,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread -lrt
++QMAKE_LIBS_THREAD       = -pthread -lrt
+ QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl
+ 
+ QMAKE_AR                = ar cq
+diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
+index a4f64d9c..d594774f 100644
+--- a/mkspecs/cygwin-g++/qmake.conf
++++ b/mkspecs/cygwin-g++/qmake.conf
+@@ -61,7 +61,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ QMAKE_PREFIX_SHLIB      = lib
+ QMAKE_EXTENSION_SHLIB   = dll
+ QMAKE_PREFIX_STATICLIB  = lib
+diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
+index 66662f90..a93e4f98 100644
+--- a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
++++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
+@@ -41,7 +41,7 @@ QMAKE_CFLAGS           += $${COMPILER_FLAGS}
+ QMAKE_CXXFLAGS         += $${COMPILER_FLAGS}
+ QMAKE_CXXFLAGS_RELEASE += -O3
+ 
+-QMAKE_LIBS             += -lrt -lpthread -ldl
++QMAKE_LIBS             += -lrt -pthread -ldl
+ 
+ # Extra stuff (OpenGL, DirectFB, ...)
+ QMAKE_INCDIR_EGL        = $$[QT_SYSROOT]/usr/include
+diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
+index 604da50f..9dbf82c7 100644
+--- a/mkspecs/devices/linux-beagleboard-g++/qmake.conf
++++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
+@@ -33,7 +33,7 @@ QMAKE_CFLAGS           += $${COMPILER_FLAGS}
+ QMAKE_CXXFLAGS         += $${COMPILER_FLAGS}
+ QMAKE_CXXFLAGS_RELEASE += -O3
+ 
+-QMAKE_LIBS             += -lrt -lpthread -ldl
++QMAKE_LIBS             += -lrt -pthread -ldl
+ 
+ # Extra stuff (OpenGL, DirectFB, ...)
+ QMAKE_INCDIR_EGL        =
+diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
+index 4c376de7..0a3ec98c 100644
+--- a/mkspecs/hpuxi-g++-64/qmake.conf
++++ b/mkspecs/hpuxi-g++-64/qmake.conf
+@@ -62,7 +62,7 @@ QMAKE_LFLAGS_DEBUG      =
+ QMAKE_LFLAGS_SHLIB      = -fPIC -shared
+ QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME     = -Wl,+h,
+-QMAKE_LFLAGS_THREAD     = -lpthread
++QMAKE_LFLAGS_THREAD     = -pthread
+ QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
+ QMAKE_LFLAGS_RPATH      = -Wl,+b,
+ 
+@@ -70,7 +70,7 @@ QMAKE_LIBS              = -lm
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ QMAKE_LIBS_YACC         = -ly
+ 
+ QMAKE_AR                = ar cqs
+diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
+index f701755f..ba40b0b5 100644
+--- a/mkspecs/hurd-g++/qmake.conf
++++ b/mkspecs/hurd-g++/qmake.conf
+@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL          = -lEGL
+ QMAKE_LIBS_OPENGL       = -lGL
+ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lOpenVG
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ 
+ QMAKE_AR                = ar cqs
+ QMAKE_OBJCOPY           = objcopy
+diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
+index 09f897d0..78323668 100644
+--- a/mkspecs/linux-icc/qmake.conf
++++ b/mkspecs/linux-icc/qmake.conf
+@@ -38,7 +38,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lm
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ 
+ QMAKE_AR                = xiar cqs
+ QMAKE_OBJCOPY           = objcopy
+diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
+index 1a44d932..8b2de6c9 100644
+--- a/mkspecs/lynxos-g++/qmake.conf
++++ b/mkspecs/lynxos-g++/qmake.conf
+@@ -65,7 +65,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lm
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ 
+ QMAKE_AR                = ar cqs
+ QMAKE_OBJCOPY           = objcopy
+diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
+index e2317de3..f6cc9aa4 100644
+--- a/mkspecs/solaris-cc-64/qmake.conf
++++ b/mkspecs/solaris-cc-64/qmake.conf
+@@ -81,7 +81,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread -lrt
++QMAKE_LIBS_THREAD       = -pthread -lrt
+ QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl
+ 
+ QMAKE_AR                = CC -xar -o
+diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
+index 1a711e75..af1a142c 100644
+--- a/mkspecs/solaris-cc/qmake.conf
++++ b/mkspecs/solaris-cc/qmake.conf
+@@ -64,7 +64,7 @@ QMAKE_LIBS              =
+ QMAKE_LIBS_DYNLOAD      = -ldl
+ QMAKE_LIBS_X11          = -lXext -lX11 -lresolv -lsocket -lnsl
+ QMAKE_LIBS_OPENGL       = -lGL
+-QMAKE_LIBS_THREAD       = -lpthread -lrt
++QMAKE_LIBS_THREAD       = -pthread -lrt
+ QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl
+ 
+ QMAKE_AR                = CC -xar -o
+diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
+index 7853ade8..b73763d1 100644
+--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
++++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
+@@ -102,7 +102,7 @@ QMAKE_LIBS_EGL          = -lEGL
+ QMAKE_LIBS_OPENGL       = -lGL
+ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lOpenVG
+-QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_THREAD       = -pthread
+ 
+ QMAKE_AR                = host-ar cqs
+ QMAKE_OBJCOPY           = host-objcopy
+diff --git a/src/corelib/configure.json b/src/corelib/configure.json
+index a9025a2d..89a69462 100644
+--- a/src/corelib/configure.json
++++ b/src/corelib/configure.json
+@@ -355,7 +355,7 @@
+                     "std::future<int> f = std::async([]() { return 42; });",
+                     "(void)f.get();"
+                 ],
+-                "qmake": "unix:!vxworks:LIBS += -lpthread"
++                "qmake": "unix:!vxworks:LIBS += -pthread"
+             }
+         },
+         "cxx11_random": {
+@@ -466,7 +466,7 @@
+                     "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
+                     "shm_unlink(\"test\");"
+                 ],
+-                "qmake": "linux: LIBS += -lpthread -lrt"
++                "qmake": "linux: LIBS += -pthread -lrt"
+             }
+         },
+         "linkat": {

qt5-qtbase-5.12.1-firebird-4.0.0.patch

@@ -0,0 +1,17 @@
+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": "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": {

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-gcc11.patch

@@ -0,0 +1,171 @@
+diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
+index 06fd88da..dbff3239 100644
+--- a/src/corelib/codecs/qtextcodec.cpp
++++ b/src/corelib/codecs/qtextcodec.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qplatformdefs.h"
+ 
+ #include "qtextcodec.h"
+diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
+index 8561f908..8128d3cf 100644
+--- a/src/corelib/codecs/qutfcodec.cpp
++++ b/src/corelib/codecs/qutfcodec.cpp
+@@ -38,6 +38,8 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
++
+ #include "qutfcodec_p.h"
+ #include "qlist.h"
+ #include "qendian.h"
+diff --git a/src/corelib/global/qendian.cpp b/src/corelib/global/qendian.cpp
+index eb08b2f8..6b41b3dd 100644
+--- a/src/corelib/global/qendian.cpp
++++ b/src/corelib/global/qendian.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qendian.h"
+ 
+ #include "qalgorithms.h"
+diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
+index c9733174..c62a1972 100644
+--- a/src/corelib/global/qfloat16.cpp
++++ b/src/corelib/global/qfloat16.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qfloat16.h"
+ #include "private/qsimd_p.h"
+ #include <cmath> // for fpclassify()'s return values
+diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
+index 10672c1f..6d5fd63e 100644
+--- a/src/corelib/global/qrandom.cpp
++++ b/src/corelib/global/qrandom.cpp
+@@ -40,6 +40,7 @@
+ // for rand_s
+ #define _CRT_RAND_S
+ 
++#include <limits>
+ #include "qrandom.h"
+ #include "qrandom_p.h"
+ #include <qobjectdefs.h>
+diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp
+index 13eee353..9e7a7a41 100644
+--- a/src/corelib/plugin/qelfparser_p.cpp
++++ b/src/corelib/plugin/qelfparser_p.cpp
+@@ -37,6 +37,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qelfparser_p.h"
+ 
+ #if defined (Q_OF_ELF) && defined(Q_CC_GNU)
+diff --git a/src/corelib/plugin/qmachparser.cpp b/src/corelib/plugin/qmachparser.cpp
+index 11670caf..39f5596b 100644
+--- a/src/corelib/plugin/qmachparser.cpp
++++ b/src/corelib/plugin/qmachparser.cpp
+@@ -37,6 +37,8 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
++
+ #include "qmachparser_p.h"
+ 
+ #if defined(Q_OF_MACH_O)
+diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
+index 83873edf..5aafb4e5 100644
+--- a/src/corelib/plugin/quuid.cpp
++++ b/src/corelib/plugin/quuid.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "quuid.h"
+ 
+ #include "qcryptographichash.h"
+diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
+index 5082a8cb..7eecfcca 100644
+--- a/src/corelib/serialization/qdatastream.cpp
++++ b/src/corelib/serialization/qdatastream.cpp
+@@ -40,6 +40,8 @@
+ #include "qdatastream.h"
+ #include "qdatastream_p.h"
+ 
++#include <limits>
++
+ #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
+ #include "qbuffer.h"
+ #include "qfloat16.h"
+diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
+index 9a72df58..6651ee98 100644
+--- a/src/corelib/text/qbytearray.cpp
++++ b/src/corelib/text/qbytearray.cpp
+@@ -39,6 +39,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qbytearray.h"
+ #include "qbytearraymatcher.h"
+ #include "private/qtools_p.h"
+diff --git a/src/corelib/text/qbytearraymatcher.cpp b/src/corelib/text/qbytearraymatcher.cpp
+index 72e09226..80511cb5 100644
+--- a/src/corelib/text/qbytearraymatcher.cpp
++++ b/src/corelib/text/qbytearraymatcher.cpp
+@@ -37,6 +37,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qbytearraymatcher.h"
+ 
+ #include <limits.h>
+diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
+index ab3054d5..22efb3a0 100644
+--- a/src/corelib/tools/qbitarray.cpp
++++ b/src/corelib/tools/qbitarray.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qbitarray.h"
+ #include <qalgorithms.h>
+ #include <qdatastream.h>
+diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
+index fa8d21e0..cd85956d 100644
+--- a/src/corelib/tools/qcryptographichash.cpp
++++ b/src/corelib/tools/qcryptographichash.cpp
+@@ -38,6 +38,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include <qcryptographichash.h>
+ #include <qiodevice.h>
+ 
+diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
+index e00f9d05..917ab5f9 100644
+--- a/src/gui/text/qfontengine_qpf2.cpp
++++ b/src/gui/text/qfontengine_qpf2.cpp
+@@ -37,6 +37,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <limits>
+ #include "qfontengine_qpf2_p.h"
+ 
+ #include <QtCore/QFile>

qt5-qtbase.spec

@@ -2,27 +2,29 @@
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
 
-# support openssl-1.1
-%if 0%{?fedora} > 26
-%global openssl11 1
-%endif
-%global openssl -openssl-linked
-
-%if 0%{?fedora} < 29
+%if 0%{?fedora} < 29 && 0%{?rhel} < 9
 %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
+%if 0%{?fedora} < 30  || 0%{?rhel} > 6
 %global no_feature_statx -no-feature-statx
 %global no_feature_renameat2 -no-feature-renameat2
 %endif
+%if 0%{?rhel} && 0%{?rhel} > 6
+%global no_feature_getentropy -no-feature-getentropy
+%endif
 
 # support qtchooser (adds qtchooser .conf file)
+%if 0%{?flatpak}
+%global qtchooser 0
+%else
 %global qtchooser 1
+%endif
 %if 0%{?qtchooser}
 %global priority 10
 %ifarch %{multilib_basearchs}
@@ -30,6 +32,9 @@
 %endif
 %endif
 
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
 %global platform linux-g++
 
 %if 0%{?use_clang}
@@ -41,10 +46,9 @@
 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 # use external qt_settings pkg
+%if 0%{?fedora}
 %global qt_settings 1
-
-%global journald -journald
-BuildRequires: pkgconfig(libsystemd)
+%endif
 
 %global examples 1
 ## skip for now, until we're better at it --rex
@@ -52,14 +56,14 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.14.2
-Release: 4%{?dist}
+Version: 5.15.9
+Release: 1.0.riscv64%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
-License: LGPLv2 with exceptions or GPLv3 with exceptions
+License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 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/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
 Source1: qtlogging.ini
@@ -78,11 +82,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
+# make mixing versions with private apis a warning instead of fatal error
+Patch3: qtbase-everywhere-src-5.15.6-private_api_warning.patch
 
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@@ -109,27 +110,48 @@ 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
 
+# fix FTBFS against libglvnd-1.3.4+
+Patch56: qtbase-everywhere-src-5.15.2-libglvnd.patch
+
 # drop -O3 and make -O2 by default
 Patch61: qt5-qtbase-cxxflag.patch
 
 # support firebird version 3.x
-Patch64: qt5-qtbase-5.12.1-firebird.patch
+Patch63: qt5-qtbase-5.12.1-firebird.patch
+
+# support firebird version 4.x
+Patch64: qt5-qtbase-5.12.1-firebird-4.0.0.patch
 
 # fix for new mariadb
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
 
-# python3
-Patch68: qtbase-everywhere-src-5.11.1-python3.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
+# gcc-11
+Patch90: %{name}-gcc11.patch
 
 ## upstream patches
-Patch100: qt5-qtbase-CVE-2015-9541.patch
-Patch144: 0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
+# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
+# git diff v5.15.9-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
+# patch100 in lookaside cache due to large'ish size -- rdieter
+Patch100: kde-5.15-rollup-20230411.patch.gz
+# HACK to make 'fedpkg sources' consider it 'used"
+Source100: kde-5.15-rollup-20230411.patch.gz
+
+Patch101: qtbase-5.15.8-fix-missing-qtsan-include.patch
+
+# Workaround for font rendering issue with cjk-vf-fonts
+# https://bugreports.qt.io/browse/QTBUG-111994
+# https://bugreports.qt.io/browse/QTBUG-112136
+Patch102: qtbase-QTBUG-111994.patch
+Patch103: qtbase-QTBUG-112136.patch
+
+# riscv64, libatomic issue, sub-word atomics need libatomic
+# -pthread links that by default via GCC spec
+Patch300: pthread-riscv64.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -140,8 +162,15 @@ Patch144: 0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
 # filter plugin provides
 %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$
 
+%if 0%{?use_clang}
+BuildRequires: clang >= 3.7.0
+%else
+BuildRequires: gcc-c++
+%endif
+BuildRequires: make
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
+BuildRequires: double-conversion-devel
 BuildRequires: findutils
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
@@ -149,56 +178,35 @@ 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
-%global dbus -dbus-linked
 BuildRequires: pkgconfig(dbus-1)
-%endif
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(libproxy-1.0)
+BuildRequires: pkgconfig(libsctp)
 # xcb-sm
 BuildRequires: pkgconfig(ice) pkgconfig(sm)
 BuildRequires: pkgconfig(libpng)
 BuildRequires: pkgconfig(libudev)
-%if 0%{?fedora} == 26
-BuildRequires: compat-openssl10-devel
-%else
-BuildRequires: openssl-devel%{?openssl11: >= 1.1}
-%endif
+BuildRequires: openssl-devel
 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
-%if 0%{?fedora}
-#global xkbcommon -system-xkbcommon
 BuildRequires: pkgconfig(libinput)
+BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
+BuildRequires: pkgconfig(xcb-util)
 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
-%else
-# not Fedora
-%if 0%{?rhel} == 6
-%global xcb -qt-xcb
-%endif
-#global xkbcommon -qt-xkbcommon
-Provides: bundled(libxkbcommon) = 0.4.1
-%endif
 BuildRequires: pkgconfig(xkeyboard-config)
+%global vulkan 1
+BuildRequires: pkgconfig(vulkan)
 %if 0%{?fedora} || 0%{?rhel} > 6
 %global egl 1
 BuildRequires: libEGL-devel
 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
@@ -216,6 +224,7 @@ BuildRequires: libicu-devel
 %endif
 BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
 BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libzstd)
 BuildRequires: perl-generators
 # see patch68
 BuildRequires: python3
@@ -228,6 +237,7 @@ BuildRequires: time
 BuildRequires: xorg-x11-server-Xvfb
 %endif
 
+
 %if 0%{?qtchooser}
 %if 0%{?fedora}
 Conflicts: qt < 1:4.8.6-10
@@ -264,6 +274,12 @@ Summary: Common files for Qt5
 # offer upgrade path for qtquick1 somewhere... may as well be here -- rex
 Obsoletes: qt5-qtquick1 < 5.9.0
 Obsoletes: qt5-qtquick1-devel < 5.9.0
+%if "%{?ibase}" == "-no-sql-ibase"
+Obsoletes: qt5-qtbase-ibase < %{version}-%{release}
+%endif
+%if "%{?tds}" == "-no-sql-tds"
+Obsoletes: qt5-qtbase-tds < %{version}-%{release}
+%endif
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 %description common
@@ -277,6 +293,9 @@ Requires: %{name}-gui%{?_isa}
 Requires: libEGL-devel
 %endif
 Requires: pkgconfig(gl)
+%if 0%{?vulkan}
+Requires: pkgconfig(vulkan)
+%endif
 Requires: qt5-rpm-macros
 %if 0%{?use_clang}
 Requires: clang >= 3.7.0
@@ -306,10 +325,8 @@ Summary: Static library files for %{name}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Requires: pkgconfig(fontconfig)
 Requires: pkgconfig(glib-2.0)
-%if 0%{?fedora}
 Requires: pkgconfig(libinput)
 Requires: pkgconfig(xkbcommon)
-%endif
 Requires: pkgconfig(zlib)
 
 %description static
@@ -326,10 +343,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %package mysql
 Summary: MySQL driver for Qt5's SQL classes
-%if 0%{?fedora} > 27
-BuildRequires: mariadb-connector-c-devel
-%else
+%if 0%{?rhel} && 0%{?rhel} < 9
 BuildRequires: mysql-devel
+%else
+BuildRequires: mariadb-connector-c-devel
 %endif
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description mysql
@@ -362,7 +379,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %package gui
 Summary: Qt5 GUI-related libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%if 0%{?fedora} > 20
+# where Recommends are supported
+%if 0%{?fedora} || 0%{?rhel} >= 8 
 Recommends: mesa-dri-drivers
 %endif
 Obsoletes: qt5-qtbase-x11 < 5.2.0
@@ -377,32 +395,45 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}
 
-## upstream fixes
+## dowstream patches
+%patch -P3 -p1 -b .private_api_warning
 
-# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
-%patch8 -p1
+## upstream fixes
 
 %patch50 -p1 -b .QT_VERSION_CHECK
 # FIXME/TODO : rebase or drop -- rdieter
-#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
-%patch61 -p1 -b .qt5-qtbase-cxxflag
-%patch64 -p1 -b .firebird
+#patch -P51 -p1 -b .hidpi_scale_at_192
+%patch -P52 -p1 -b .moc_macros
+%patch -P53 -p1 -b .qt5gui_cmake_isystem_includes
+%patch -P54 -p1 -b .qmake_LFLAGS
+%patch -P55 -p1 -b .no_relocatable
+%patch -P56 -p1 -b .libglvnd
+%patch -P61 -p1 -b .qt5-qtbase-cxxflag
+%if 0%{?fedora} < 35
+%patch -P63 -p1 -b .firebird
+%else
+%patch -P64 -p1 -b .firebird
+%endif
 %if 0%{?fedora} > 27
-%patch65 -p1 -b .mysql
+%patch -P65 -p1 -b .mysql
 %endif
-%patch68 -p1
 
-%if 0%{?fedora} > 30
-%patch80 -p1 -b .use-wayland-on-gnome.patch
+%if 0%{?fedora} > 30 || 0%{?rhel} > 8
+%patch -P80 -p1 -b .use-wayland-on-gnome.patch
 %endif
 
+%patch -P90 -p1 -b .gcc11
+
 ## upstream patches
-%patch100 -p1 -b .CVE-2015-9541
-%patch144 -p1 -b .0044
+%patch -P100 -p1
+%patch -P101 -p1
+%patch -P102 -p1
+%patch -P103 -p1
+
+#riscv64
+%ifarch riscv64
+%patch -P300 -p1 -b .riscv_libatomic
+%endif
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -429,6 +460,13 @@ sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \
 
 
 %build
+# QT is known not to work properly with LTO at this point.  Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change.  Until such time...
+# Disable LTO
+# https://bugzilla.redhat.com/1900527
+%define _lto_cflags %{nil}
+
 ## FIXME/TODO:
 # * for %%ix86, add sse2 enabled builds for Qt5Gui, Qt5Core, QtNetwork, see also:
 #   http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git/tree/debian/rules (234-249)
@@ -468,18 +506,22 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -release \
   -shared \
   -accessibility \
-  %{?dbus}%{!?dbus:-dbus-runtime} \
+  -dbus-linked \
+  %{?egl:-egl -eglfs} \
   -fontconfig \
   -glib \
   -gtk \
   %{?ibase} \
   -icu \
-  %{?journald} \
+  -journald \
   -optimized-qmake \
-  %{?openssl} \
+  -openssl-linked \
+  -libproxy \
+  -sctp \
   %{!?examples:-nomake examples} \
   %{!?tests:-nomake tests} \
   -no-pch \
+  -no-reduce-relocations \
   -no-rpath \
   -no-separate-debug-info \
   %{?no_sse2} \
@@ -498,10 +540,25 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -no-feature-relocatable \
   %{?no_feature_renameat2} \
   %{?no_feature_statx} \
+  %{?no_feature_getentropy} \
   QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
   QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
 
+# Validate config results
+%if "%{?ibase}" != "-no-sql-ibase"
+for config_test in egl-x11 ibase ; do
+%else
+for config_test in egl-x11 ; do
+%endif
+config_result="$(grep ^cache.${config_test}.result config.cache | cut -d= -f2 | tr -d ' ')"
+if [ "${config_result}" != "true" ]; then
+  echo "${config_test} detection failed"
+  config_failed=1
+fi
+done
+if [ ${config_failed} -eq 1 ]; then exit 1; fi
+
 # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
 make clean -C qmake
 %make_build -C qmake all binary \
@@ -540,7 +597,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: %{version}
+Version: 5.15.9
 EOF
 
 # rpm macros
@@ -606,7 +663,7 @@ 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
+%if 0%{?fedora} < 29 && 0%{?rhel} < 9
 # 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
@@ -624,6 +681,10 @@ EOF
 mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
 install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt5_headerdir}/QtXcb/
 
+# drop Qt5Bootstrap from -static (#2017661)
+rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.*a
+rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.prl
+
 
 %check
 # verify Qt5.pc
@@ -848,25 +909,27 @@ 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}/cmake/Qt5AccessibilitySupport/
+%{_qt5_libdir}/cmake/Qt5DeviceDiscoverySupport/
+%{_qt5_libdir}/cmake/Qt5EdidSupport/
+%{_qt5_libdir}/cmake/Qt5EglFSDeviceIntegration/
+%{_qt5_libdir}/cmake/Qt5EglFsKmsSupport/
+%{_qt5_libdir}/cmake/Qt5EglSupport/
+%{_qt5_libdir}/cmake/Qt5EventDispatcherSupport/
+%{_qt5_libdir}/cmake/Qt5FbSupport/
+%{_qt5_libdir}/cmake/Qt5FontDatabaseSupport/
+%{_qt5_libdir}/cmake/Qt5GlxSupport/
+%{_qt5_libdir}/cmake/Qt5InputSupport/
+%{_qt5_libdir}/cmake/Qt5KmsSupport/
+%{_qt5_libdir}/cmake/Qt5LinuxAccessibilitySupport/
+%{_qt5_libdir}/cmake/Qt5PlatformCompositorSupport/
+%{_qt5_libdir}/cmake/Qt5ServiceSupport/
+%{_qt5_libdir}/cmake/Qt5ThemeSupport/
+%{_qt5_libdir}/cmake/Qt5XcbQpa/
+%{_qt5_libdir}/cmake/Qt5XkbCommonSupport/
+%{_qt5_libdir}/metatypes/qt5core_metatypes.json
+%{_qt5_libdir}/metatypes/qt5gui_metatypes.json
+%{_qt5_libdir}/metatypes/qt5widgets_metatypes.json
 %{_qt5_libdir}/pkgconfig/Qt5.pc
 %{_qt5_libdir}/pkgconfig/Qt5Concurrent.pc
 %{_qt5_libdir}/pkgconfig/Qt5Core.pc
@@ -887,15 +950,13 @@ fi
 ## 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/
+%exclude %{_qt5_headerdir}/*/%{version}/
 
 %files private-devel
-%{_qt5_headerdir}/*/%{version}/*/private/
+%{_qt5_headerdir}/*/%{version}/
 #{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
 
 %files static
-%{_qt5_libdir}/libQt5Bootstrap.*a
-%{_qt5_libdir}/libQt5Bootstrap.prl
 %{_qt5_headerdir}/QtOpenGLExtensions/
 %{_qt5_libdir}/libQt5OpenGLExtensions.*a
 %{_qt5_libdir}/libQt5OpenGLExtensions.prl
@@ -943,6 +1004,12 @@ fi
 %{_qt5_libdir}/libQt5EdidSupport.prl
 %{_qt5_libdir}/libQt5XkbCommonSupport.*a
 %{_qt5_libdir}/libQt5XkbCommonSupport.prl
+%if 0%{?vulkan}
+%{_qt5_headerdir}/QtVulkanSupport/
+%{_qt5_libdir}/cmake/Qt5VulkanSupport/
+%{_qt5_libdir}/libQt5VulkanSupport.*a
+%{_qt5_libdir}/libQt5VulkanSupport.prl
+%endif
 
 %if 0%{?examples}
 %files examples
@@ -988,10 +1055,8 @@ fi
 %{_qt5_plugindir}/generic/libqevdevmouseplugin.so
 %{_qt5_plugindir}/generic/libqevdevtabletplugin.so
 %{_qt5_plugindir}/generic/libqevdevtouchplugin.so
-%if 0%{?fedora}
 %{_qt5_plugindir}/generic/libqlibinputplugin.so
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake
-%endif
 %{_qt5_plugindir}/generic/libqtuiotouchplugin.so
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
 %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
@@ -1048,6 +1113,234 @@ fi
 
 
 %changelog
+* Fri May 12 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5.15.9-1.0.riscv64
+- Replace -lpthread with -pthread on riscv64 (libatomic)
+
+* Tue Apr 11 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
+- 5.15.9
+
+* Wed Mar 29 2023 Than Ngo <than@redhat.com> - 5.15.8-10
+- Related bz#2179854, Qt 5 render the Bold style CJK character very thick
+  with Noto CJK variable fonts
+- Fix deprecated patch rpm macro
+
+* Tue Mar 28 2023 Kalev Lember <klember@redhat.com> - 5.15.8-9
+- Disable qtchooser for flatpak builds
+
+* Mon Mar 27 2023 Than Ngo <than@redhat.com> - 5.15.8-8
+- Fix bz#2179854, Qt 5 render the Bold style CJK character very thick
+  with Noto CJK variable fonts
+
+* Mon Mar 20 2023 Than Ngo <than@redhat.com> - 5.15.8-7
+- Fix bz#2178389, Qt application render very thin fonts after
+  switch to VF version of Noto CJK fonts
+
+* Mon Feb 27 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-6
+- refresh kde-5.15-rollup patch
+
+* Wed Feb 08 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-5
+- Fix possible DOS involving the Qt SQL ODBC driver plugin
+  CVE-2023-24607
+
+* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-4
+- migrated to SPDX license
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-2
+- Correctly install qtsan header file
+
+* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-1
+- 5.15.8
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 5.15.7-2
+- Rebuild for ICU 72
+
+* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
+- 5.15.7
+
+* Tue Oct 11 2022 Rex Dieter <rdieter@gmail.com> - 5.15.6-2
+- make mixing verisons and private api usage a warning instead of fatal error
+
+* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
+- 5.15.6
+
+* Wed Aug 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-4
+- Update to latest changes from Qt patch collection
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.15.5-3
+- Rebuilt for ICU 71.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
+- 5.15.5
+
+* Tue Jun 21 2022 Than Ngo <than@redhat.com> - 5.15.4-4
+- bz#2099267, backport patch to fix download problem from Settings 
+
+* Mon May 30 2022 Than Ngo <than@redhat.com> - 5.15.4-3
+- bz#1994719, CVE-2021-38593
+
+* Sun May 22 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-2
+- Rebuild (broken update)
+
+* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
+- 5.15.4
+
+* Fri Apr 01 2022 Than Ngo <than@redhat.com> - 5.15.3-2
+- bz#2070958, enable zstd
+
+* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
+- 5.15.3 + kde-5.15 fixes
+
+* Thu Feb 17 2022 Than Ngo <than@redhat.com> - 5.15.2-35
+- Fixed CVE-2022-25255
+
+* Mon Jan 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.2-34
+- refresh kde-5.15-rollup patch
+
+* Mon Jan 24 2022 Timm Bäder <tbaeder@redhat.com> - 5.15.2-33
+- Disable automatic .la file removal
+- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-31
+- refresh kde-5.15-rollup patch
+
+* Mon Dec 06 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-30
+- refresh kde-5.15-rollup patch
+
+* Wed Nov 24 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-29
+- refresh kde-5.15-rollup patch
+
+* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 5.15.2-28
+- Drop Qt5Bootstrap files from -static (#2017661)
+
+* Tue Oct 26 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-27
+- refresh kde-5.15-rollup patch
+
+* Tue Oct 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-26
+- refresh kde-5.15-rollup patch (#2012371)
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 5.15.2-25
+- Rebuilt with OpenSSL 3.0.0
+
+* Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-24
+- refresh kde-5.15-rollup patch
+- validate configure results (base, egl-x11)
+- fix libglvnd-1.3.4 FTBFS (#2002416)
+
+* Tue Sep 07 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-23
+- (re)enable ibase
+- handle upgrade path when/if some db drivers are ever disabled (ibase,tds)
+- -gui: add mesa-dri-drivers soft dep for rhel8+ too
+
+* Mon Aug 23 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-22
+- sync kde/5.15 branch patches
+
+* Thu Jul 29 2021 Than Ngo <than@redhat.com> - 5.15.2-21
+- Fixed FTBFS against firebird-4.0.0
+
+* Tue Jul 27 2021 Than Ngo <than@redhat.com> - 5.15.2-20
+- Disable sql-ibase temporary (firebird build failed on s390x, bz#1969393)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 5.15.2-18
+- Rebuild for ICU 69
+
+* Thu May 13 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-17
+- -devel: fix some cmake-related dir ownership
+
+* Sat May 01 2021 Alessandro Astone <ales.astone@gmail.com> - 5.15.2-16
+- Backport upstream fix for QTBUG-91909
+
+* Tue Mar 09 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-15
+- FileChooser portal: send window id in hex
+
+* Fri Feb 19 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-14
+- %%build: explicitly pass -egl build option
+- unconditional BR: pkgconfig(glesv2) again
+
+* Tue Feb 09 2021 Pavel Raiskup <praiskup@redhat.com> - 5.15.2-13
+- rebuild all postgresql deps once more, for libpq ABI fix rhbz#1908268
+
+* Mon Feb 08 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-12
+- Use Wayland platform on GNOME for RHEL 9
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 5.15.2-11
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-10
+- FTBFS: qendian.h (and qfloat16.h) missing <limits> include (QTBUG-90395)
+- Qt build on GCC 11 (QTBUG-89977)
+
+* Mon Feb 01 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-9
+- Disable getentropy on RHEL
+
+* Fri Jan 29 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-8
+- Disable statx and renameat2 on RHEL
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Dec 19 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-6
+- rebuild (gcc11)
+
+* Mon Nov 30 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-5
+- re-enable vulkan support on s390x, root cause fixed
+
+* Sun Nov 29 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-4
+- drop vulkan support on s390x (#1902449)
+
+* Fri Nov 27 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
+- Require qt-settings only in Fedora builds
+
+* Mon Nov 23 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-2
+- -no-reduce-relocations (#1900527)
+
+* Fri Nov 20 09:27:41 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+- 5.15.2
+
+* Tue Nov 03 2020 Sandro Mani <manisandro@gmail.com> - 5.15.1-7
+- Backport upstream fix for QTBUG-86319
+
+* Sun Oct 18 2020 Jeff Law <law@redhat.com> - 5.15.1-6
+- Fix missing #includes for gcc-11
+
+* Wed Sep 30 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-5
+- Upstream fix: Emit QScreen::geometryChanged when the logical DPI changes
+
+* Tue Sep 29 2020 Yaroslav Fedevych <yaroslav@fedevych.name> - 5.15.1-4
+- qt5-qtbase-devel requires vulkan headers
+
+* Thu Sep 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.1-3
+- enable vulkan support (#1794969)
+
+* Thu Sep 10 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.1-2
+- CentOS8 - numpad do not work in KDE Plasma (#1868371)
+
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+- 5.15.1
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 5.14.2-7
+- Disable LTO
+
+* Mon Jun 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-6
+- Qt5 private header packaging breaks Qt5 Cmake files (#1846613)
+
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 5.14.2-5
+- Rebuild for ICU 67
+
 * Tue Apr 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-4
 - backport "Mutex deadlock in QPluginLoader, Krita fails to start" (QTBUG-83207)
 

qtbase-QTBUG-111994.patch

@@ -0,0 +1,12 @@
+diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+index 00aa80cd..dd715b73 100644
+--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
++++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+@@ -564,6 +564,7 @@ void QFontconfigDatabase::populateFontDatabase()
+             FcObjectSetAdd(os, *p);
+             ++p;
+         }
++        FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
+         fonts = FcFontList(nullptr, pattern, os);
+         FcObjectSetDestroy(os);
+         FcPatternDestroy(pattern);

qtbase-QTBUG-112136.patch

@@ -0,0 +1,108 @@
+diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+index dd715b73..3d88af3a 100644
+--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
++++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+@@ -954,6 +954,7 @@ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef
+     QFontEngine::GlyphFormat format;
+     // try and get the pattern
+     FcPattern *pattern = FcPatternCreate();
++    FcPattern *match = NULL;
+
+     FcValue value;
+     value.type = FcTypeString;
+@@ -980,7 +981,41 @@ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef
+     FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
+     FcDefaultSubstitute(pattern);
+
+-    FcPattern *match = FcFontMatch(nullptr, pattern, &result);
++    if (!fid.filename.isEmpty()) {
++        // FC_INDEX is ignored during processing in FcFontMatch.
++        // So iterate FcPatterns directly and find it out.
++        FcFontSet *fcsets[2], *fcfs;
++
++        fcsets[0] = FcConfigGetFonts(nullptr, FcSetSystem);
++        fcsets[1] = FcConfigGetFonts(nullptr, FcSetApplication);
++        for (int nset = 0; nset < 2; nset++) {
++            fcfs = fcsets[nset];
++            for (int fnum = 0; fnum < fcfs->nfont; fnum++) {
++                FcPattern *fcpat = fcfs->fonts[fnum];
++                FcChar8 *fcfile;
++                FcBool variable;
++                int fcindex;
++
++                // FIXME: Ignore a FcPattern which has variable=true at this point.
++                if (FcPatternGetBool(fcpat, FC_VARIABLE, 0, &variable) == FcResultMatch &&
++                    variable == FcTrue)
++                    continue;
++                if (FcPatternGetString(fcpat, FC_FILE, 0, &fcfile) == FcResultMatch &&
++                    FcPatternGetInteger(fcpat, FC_INDEX, 0, &fcindex) == FcResultMatch) {
++                    QByteArray f = QByteArray::fromRawData((const char *)fcfile,
++                                                           strlen((const char *)fcfile));
++                    if (f == fid.filename && fcindex == fid.index) {
++                        // We found it.
++                        match = FcFontRenderPrepare(nullptr, pattern, fcpat);
++                        goto bail;
++                    }
++                }
++            }
++        }
++    }
++bail:
++    if (!match)
++        match = FcFontMatch(nullptr, pattern, &result);
+     if (match) {
+         engine->setDefaultHintStyle(defaultHintStyleFromMatch((QFont::HintingPreference)fontDef.hintingPreference, match, useXftConf));
+
+@@ -1000,6 +1035,11 @@ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef
+                 antialias = fc_antialias;
+         }
+
++        FcBool embolden;
++        engine->auto_embolden = true;
++        if (FcPatternGetBool(match, FC_EMBOLDEN, 0, &embolden) == FcResultMatch)
++            engine->embolden = embolden;
++
+         if (antialias) {
+             QFontEngine::SubpixelAntialiasingType subpixelType = QFontEngine::Subpixel_None;
+             if (!(fontDef.styleStrategy & QFont::NoSubpixelAntialias))
+diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+index 52ce36b0..9626490b 100644
+--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
++++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+@@ -681,6 +681,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
+     kerning_pairs_loaded = false;
+     transform = false;
+     embolden = false;
++    auto_embolden = false;
+     obliquen = false;
+     antialias = true;
+     freetype = nullptr;
+@@ -748,7 +749,7 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
+         FT_Set_Transform(face, &matrix, nullptr);
+         freetype->matrix = matrix;
+         // fake bold
+-        if ((fontDef.weight >= QFont::Bold) && !(face->style_flags & FT_STYLE_FLAG_BOLD) && !FT_IS_FIXED_WIDTH(face) && !qEnvironmentVariableIsSet("QT_NO_SYNTHESIZED_BOLD")) {
++        if (!auto_embolden && (fontDef.weight >= QFont::Bold) && !(face->style_flags & FT_STYLE_FLAG_BOLD) && !FT_IS_FIXED_WIDTH(face) && !qEnvironmentVariableIsSet("QT_NO_SYNTHESIZED_BOLD")) {
+             if (const TT_OS2 *os2 = reinterpret_cast<const TT_OS2 *>(FT_Get_Sfnt_Table(face, ft_sfnt_os2))) {
+                 if (os2->usWeightClass < 700 &&
+                     (fontDef.pixelSize < 64 || qEnvironmentVariableIsSet("QT_NO_SYNTHESIZED_BOLD_LIMIT"))) {
+@@ -2104,6 +2105,7 @@ bool QFontEngineFT::initFromFontEngine(const QFontEngineFT *fe)
+     antialias = fe->antialias;
+     transform = fe->transform;
+     embolden = fe->embolden;
++    auto_embolden = fe->auto_embolden;
+     obliquen = fe->obliquen;
+     subpixelType = fe->subpixelType;
+     lcdFilterType = fe->lcdFilterType;
+diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+index 2e3aef69..4372f913 100644
+--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
++++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+@@ -295,6 +295,7 @@ protected:
+     bool cacheEnabled;
+     bool forceAutoHint;
+     bool stemDarkeningDriver;
++    bool auto_embolden;        // a flag to decide if embolden is set by fontconfig
+
+ private:
+     friend class QFontEngineFTRawFont;

qtbase-QTBUG-89977.patch

@@ -0,0 +1,11 @@
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo	2020-10-27 03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h	2021-02-06 17:05:04.879201352 -0600
+@@ -51,6 +49,7 @@
+ 
+ #include <string>
+ #include <iterator>
++#include <limits>
+ 
+ #ifdef truncate
+ #error qbytearray.h must be included before any header file that defines truncate

qtbase-QTBUG-90395.patch

@@ -0,0 +1,23 @@
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395	2020-10-27 03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h	2021-02-06 16:36:27.072105717 -0600
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+ 
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
+diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h
+--- qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395	2021-02-06 16:36:27.074105730 -0600
++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h	2021-02-06 16:37:19.212440114 -0600
+@@ -43,6 +43,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)

qtbase-QTBUG-91909.patch

@@ -0,0 +1,31 @@
+From 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3 Mon Sep 17 00:00:00 2001
+From: Sona Kurazyan <sona.kurazyan@qt.io>
+Date: Wed, 17 Mar 2021 16:04:00 +0100
+Subject: [PATCH] Remove the unnecessary template parameter from the class specialization
+
+This seems to cause errors when compiling with gcc-11. Although this is
+most likely a compiler bug, specifiying the template parameter type in
+this case isn't necessary.
+
+Fixes: QTBUG-91909
+Fixes: QTBUG-90568
+Pick-to: 6.0 6.1 5.15
+Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
+Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
+---
+
+diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
+index cbd8ad04..4cd5b85 100644
+--- a/src/concurrent/qtconcurrentthreadengine.h
++++ b/src/concurrent/qtconcurrentthreadengine.h
+@@ -256,8 +256,8 @@
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
+ {
+ public:
+-    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
+-    :ThreadEngineStarterBase<void>(_threadEngine) {}
++    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
++        : ThreadEngineStarterBase<void>(_threadEngine) {}
+ 
+     void startBlocking()
+     {

qtbase-emit-qscreen-geometry-changed-when-logical-dpi-changes.patch

@@ -0,0 +1,56 @@
+diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
+index d294cc38..dd31e31c 100644
+--- a/src/gui/kernel/qguiapplication.cpp
++++ b/src/gui/kernel/qguiapplication.cpp
+@@ -3155,13 +3155,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
+     bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry;
+     s->d_func()->availableGeometry = e->availableGeometry;
+ 
+-    if (geometryChanged) {
+-        Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
++    const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
++    if (geometryChanged)
+         s->d_func()->updatePrimaryOrientation();
+ 
+-        emit s->geometryChanged(s->geometry());
++    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
++
++    if (geometryChanged) {
+         emit s->physicalSizeChanged(s->physicalSize());
+-        emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch());
+         emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch());
+ 
+         if (s->primaryOrientation() != primaryOrientation)
+@@ -3171,8 +3172,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
+             updateFilteredScreenOrientation(s);
+     }
+ 
+-    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
+-
+     resetCachedDevicePixelRatio();
+ }
+ 
+diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
+index df628fcc..a1afc1ba 100644
+--- a/src/gui/kernel/qscreen.cpp
++++ b/src/gui/kernel/qscreen.cpp
+@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals()
+ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged)
+ {
+     Q_Q(QScreen);
++    if (geometryChanged)
++        emit q->geometryChanged(geometry);
++
+     if (availableGeometryChanged)
+         emit q->availableGeometryChanged(availableGeometry);
+ 
+@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa
+         for (QScreen* sibling : siblings)
+             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
+     }
++
++    if (geometryChanged)
++        emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch());
+ }
+ 
+ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)

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.15.2-libglvnd.patch

@@ -0,0 +1,15 @@
+diff -up qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd qtbase-everywhere-src-5.15.2/src/gui/configure.json
+--- qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd	2020-10-27 03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/gui/configure.json	2021-09-10 10:05:53.610312223 -0500
+@@ -847,9 +847,9 @@
+                 ],
+                 "include": [ "EGL/egl.h", "X11/Xlib.h" ],
+                 "main": [
+-                    "Display *dpy = EGL_DEFAULT_DISPLAY;",
++                    "Display *dpy = reinterpret_cast<Display *>(EGL_DEFAULT_DISPLAY);",
+                     "EGLNativeDisplayType egldpy = XOpenDisplay(\"\");",
+-                    "dpy = egldpy;",
++                    "dpy = reinterpret_cast<Display *>(egldpy);",
+                     "EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);",
+                     "XDestroyWindow(dpy, w);",
+                     "XCloseDisplay(dpy);"

qtbase-everywhere-src-5.15.6-private_api_warning.patch

@@ -0,0 +1,12 @@
+diff -up qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h
+--- qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning	2022-10-11 09:08:33.712070523 -0500
++++ qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h	2022-10-11 09:10:58.647038619 -0500
+@@ -435,7 +435,7 @@ inline void QObjectPrivate::checkForInco
+     Q_UNUSED(version);
+ #else
+     if (Q_UNLIKELY(version != QObjectPrivateVersion)) {
+-        qFatal("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
++        qWarning("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
+                 (version >> 16) & 0xff, (version >> 8) & 0xff, version & 0xff,
+                 (QObjectPrivateVersion >> 16) & 0xff, (QObjectPrivateVersion >> 8) & 0xff, QObjectPrivateVersion & 0xff);
+     }

qtbase-filechooser-portal-send-window-id-in-hex.patch

@@ -0,0 +1,26 @@
+From acaabc9108dfe75530960cf8e3ec4f3602cd82e0 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Mon, 08 Mar 2021 12:29:21 +0100
+Subject: [PATCH] FileChooser portal: send window id in hex
+
+We send window id in decimal, however, it is expected to be send in hex.
+This causes a mismatch and makes portal dialog to show in background.
+
+Pick-to: 5.15 6.0 6.1
+Change-Id: Ibd77199bbb4a2ad4782a0457ddc5506c6b5608fe
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+
+diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+index ec153f6..85bdd1a 100644
+--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
++++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+@@ -185,7 +185,7 @@
+                                                           QLatin1String("/org/freedesktop/portal/desktop"),
+                                                           QLatin1String("org.freedesktop.portal.FileChooser"),
+                                                           d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile"));
+-    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId);
++    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16);
+ 
+     QVariantMap options;
+     if (!d->acceptLabel.isEmpty())

sources

@@ -1 +1,2 @@
-SHA512 (qtbase-everywhere-src-5.14.2.tar.xz) = 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+SHA512 (qtbase-everywhere-opensource-src-5.15.9.tar.xz) = 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
+SHA512 (kde-5.15-rollup-20230411.patch.gz) = 4bf88acb6d0005ae691f9b3c677610d1dc055040486c0f3654abcd6df04638c909cc18401ea4ca4da7b14065458172ad0df931e909ad9a22223439eb2fefbfd9

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