diff --git a/fix-build-error-about-messagemodel.patch b/fix-build-error-about-messagemodel.patch new file mode 100644 index 0000000000000000000000000000000000000000..f0253860c0a14870d5084b9fac104504c74c80b5 --- /dev/null +++ b/fix-build-error-about-messagemodel.patch @@ -0,0 +1,25 @@ +From 07bf8749800eebde9d9c870678479447a333da1a Mon Sep 17 00:00:00 2001 +From: peijiankang +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 456abceb3ac609295d6a04480824f027ec815ff2..5918fac13d9d56c3a44713728089ad8b3a7abe39 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 -+#include ++#include 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 #include -#include -+#include ++#include QT_BEGIN_HEADER diff --git a/qt.spec b/qt.spec index a01d157a2085a2844584eb618feb8ac930a27f87..c7aa6194393ca4cdbe753b7ea9f1ab01a4b4332e 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 - 1:4.8.7-55 +- update Patch11 and add Patch48 to fix builderror + * Mon May 8 2023 Wenlong Zhang - 1:4.8.7-54 - add loongarch64 support for qt