diff --git a/0001-fix-incorrect-use-of-locally-implemented-vector.patch b/0001-fix-incorrect-use-of-locally-implemented-vector.patch new file mode 100644 index 0000000..135298e --- /dev/null +++ b/0001-fix-incorrect-use-of-locally-implemented-vector.patch @@ -0,0 +1,61 @@ +From d685f09e034cc9632f3bdec89ba123f1e7c5e6fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= +Date: Tue, 30 Apr 2024 10:51:38 +0800 +Subject: [PATCH] fix incorrect use of locally implemented vector +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: 侯红勋 +--- + libchinese-segmentation/cppjieba/DatTrie.hpp | 3 ++- + libchinese-segmentation/cppjieba/Unicode.hpp | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/libchinese-segmentation/cppjieba/DatTrie.hpp b/libchinese-segmentation/cppjieba/DatTrie.hpp +index 4904896..3d8ed44 100644 +--- a/libchinese-segmentation/cppjieba/DatTrie.hpp ++++ b/libchinese-segmentation/cppjieba/DatTrie.hpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -92,7 +93,7 @@ inline std::ostream & operator << (std::ostream& os, const DatMemElem & elem) { + } + + struct DatDag { +- limonp::LocalVector > nexts; ++ QVector > nexts; + double max_weight; + int max_next; + }; +diff --git a/libchinese-segmentation/cppjieba/Unicode.hpp b/libchinese-segmentation/cppjieba/Unicode.hpp +index 360b461..69cea0a 100644 +--- a/libchinese-segmentation/cppjieba/Unicode.hpp ++++ b/libchinese-segmentation/cppjieba/Unicode.hpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include "limonp/LocalVector.hpp" + #include "limonp/StringUtil.hpp" + +@@ -58,8 +59,8 @@ inline std::ostream& operator << (std::ostream& os, const RuneInfo& r) { + return os << "{\"rune\": \"" << r.rune << "\", \"offset\": " << r.offset << ", \"len\": " << r.len << "}"; + } + +-typedef limonp::LocalVector RuneArray; +-typedef limonp::LocalVector RuneStrArray; ++typedef QVector RuneArray; ++typedef QVector RuneStrArray; + + // [left, right] + struct WordRange { +-- +2.43.0 + diff --git a/ukui-search.spec b/ukui-search.spec index 95baddc..8ad844b 100644 --- a/ukui-search.spec +++ b/ukui-search.spec @@ -1,11 +1,12 @@ Name: ukui-search Version: 3.1 -Release: 4 +Release: 5 Summary: a user-wide desktop search feature of UKUI desktop environment License: GPL-2.0-or-later and GPL-3.0-or-later and Apache-2.0 URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-coredump-of-ukui-search.patch +Patch02: 0001-fix-incorrect-use-of-locally-implemented-vector.patch BuildRequires: pkgconf BuildRequires: gsettings-qt-devel @@ -71,7 +72,8 @@ Summary: ukui-search-systemdbus is a systembus interface to modify max_user_wat %prep %setup -q -%patch01 -p1 +%patch 1 -p1 +%patch 2 -p1 %build mkdir build && cd build @@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 30 2024 houhongxun - 3.1-5 +- fix incorrect use of self implemented vector + * Thu Jun 15 2023 peijiankang - 3.1-4 - Type:bugfix - ID:NA