From 7f630f224d29f1383da27ae834e927c291fed9c5 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Mon, 14 Aug 2023 16:37:24 +0800
Subject: [PATCH] fix-build-error-about-messagemodel

(cherry picked from commit 6170b6a4bc540f19a7b8eb4fccde2c258e173ffc)
---
 fix-build-error-about-messagemodel.patch      | 25 +++++++++++++++++++
 ...ywhere-opensource-src-4.8.7-firebird.patch |  4 +--
 qt.spec                                       |  6 ++++-
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 fix-build-error-about-messagemodel.patch

diff --git a/fix-build-error-about-messagemodel.patch b/fix-build-error-about-messagemodel.patch
new file mode 100644
index 0000000..f025386
--- /dev/null
+++ b/fix-build-error-about-messagemodel.patch
@@ -0,0 +1,25 @@
+From 07bf8749800eebde9d9c870678479447a333da1a Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 14 Aug 2023 16:11:15 +0800
+Subject: [PATCH] fix build error about messagemodel
+
+---
+ tools/linguist/linguist/messagemodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp
+index 61c5389f..7334e0e9 100644
+--- a/tools/linguist/linguist/messagemodel.cpp
++++ b/tools/linguist/linguist/messagemodel.cpp
+@@ -183,7 +183,7 @@ static int calcMergeScore(const DataModel *one, const DataModel *two)
+         if (ContextItem *c = one->findContext(oc->context())) {
+             for (int j = 0; j < oc->messageCount(); ++j) {
+                 MessageItem *m = oc->messageItem(j);
+-                if (c->findMessage(m->text(), m->comment()) >= 0)
++                if (c->findMessage(m->text(), m->comment()))
+                     ++inBoth;
+             }
+         }
+-- 
+2.33.0
+
diff --git a/qt-everywhere-opensource-src-4.8.7-firebird.patch b/qt-everywhere-opensource-src-4.8.7-firebird.patch
index 456abce..5918fac 100644
--- a/qt-everywhere-opensource-src-4.8.7-firebird.patch
+++ b/qt-everywhere-opensource-src-4.8.7-firebird.patch
@@ -6,7 +6,7 @@ diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ib
  ****************************************************************************/
  
 -#include <ibase.h>
-+#include <firebird/ibase.h>
++#include <ibase.h>
  
  int main(int, char **)
  {
@@ -27,7 +27,7 @@ diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.i
  #include <QtSql/qsqldriver.h>
  #include <QtSql/private/qsqlcachedresult_p.h>
 -#include <ibase.h>
-+#include <firebird/ibase.h>
++#include <ibase.h>
  
  QT_BEGIN_HEADER
  
diff --git a/qt.spec b/qt.spec
index a01d157..c7aa619 100644
--- a/qt.spec
+++ b/qt.spec
@@ -13,7 +13,7 @@
 Name:           qt
 Epoch:          1
 Version:        4.8.7
-Release:        54
+Release:        55
 Summary:        A software toolkit for developing applications
 License:        (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
 URL:            http://qt-project.org/
@@ -80,6 +80,7 @@ Patch46:        qt-everywhere-opensource-src-4.8.7-riscv64.patch
 %ifarch loongarch64
 Patch47:	fix-build-error-for-loongarch64.patch
 %endif
+Patch48:        fix-build-error-about-messagemodel.patch
 Patch6000:      CVE-2018-19869.patch
 Patch6001:      CVE-2018-19872.patch
 Patch6002:      CVE-2018-19871.patch
@@ -464,6 +465,9 @@ fi
 %{_qt4_prefix}/examples/
 
 %changelog
+* Mon Aug 14 2023 huayadong <huayadong@kylinos.cn> - 1:4.8.7-55
+- update Patch11 and add Patch48 to fix builderror
+
 * Mon May  8 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 1:4.8.7-54
 - add loongarch64 support for qt
 
-- 
Gitee