From 67378ef76e1d7f15df0739c0031a22348dc7be9f Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Thu, 25 Aug 2022 11:36:59 +0300
Subject: [PATCH] qt5-tools rebuild

---
 .../toolkit/qt5/qt5-tools/files/qt_kde.patch  | 28 ++++++++++---------
 desktop/toolkit/qt5/qt5-tools/pspec.xml       |  9 +++++-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch
index 031d3d7fa5..149a731523 100644
--- a/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch
+++ b/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch
@@ -1,13 +1,15 @@
-diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
-index 288607824..8c3fc3faf 100644
---- a/src/linguist/shared/qm.cpp
-+++ b/src/linguist/shared/qm.cpp
-@@ -552,7 +552,7 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd)
-                 goto end;
-             case Tag_Translation: {
-                 int len = read32(m);
--                if (len % 1) {
-+                if (len & 1) {
-                     cd.appendError(QLatin1String("QM-Format error"));
-                     return false;
-                 }
+diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
+index feab1e2d5..cbfb82507 100644
+--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
++++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
+@@ -445,7 +445,9 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
+     if (filterSetId < 0)
+         return false;
+     ++filterSetId;
+-    for (int attId : qAsConst(filterAtts)) {
++    QList<int> attValues = filterAtts.values();
++    std::sort(attValues.begin(), attValues.end());
++    for (int attId : qAsConst(attValues)) {
+         m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
+             "VALUES(?, ?)"));
+         m_query->bindValue(0, filterSetId);
diff --git a/desktop/toolkit/qt5/qt5-tools/pspec.xml b/desktop/toolkit/qt5/qt5-tools/pspec.xml
index bb5561c1eb..af39df7a5e 100755
--- a/desktop/toolkit/qt5/qt5-tools/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-tools/pspec.xml
@@ -22,7 +22,7 @@
             <Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <!--Patch level="1">qt_kde.patch</Patch-->
+            <Patch level="1">qt_kde.patch</Patch>
         </Patches>
     </Source>
 
@@ -188,6 +188,13 @@
     </Package>
 
     <History>
+        <Update release="35">
+            <Date>2022-08-24</Date>
+            <Version>5.15.5</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="34">
             <Date>2022-07-05</Date>
             <Version>5.15.5</Version>