packages/ukui-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:528439b8b81613a10216b5a283263b0e77116f6c
Branches Tags
packages:main
..
compare: packages:cba558a42c85cb7ef74757209384cb3a206bab64
Branches Tags
packages:main

No commits in common. "528439b8b81613a10216b5a283263b0e77116f6c" and "cba558a42c85cb7ef74757209384cb3a206bab64" have entirely different histories.
528439b8b8 ... cba558a42c

6 changed files with 76 additions and 184 deletions
Show Stats Expand all files Collapse all files

33
0001-fix-compile-error-of-ukui-search.patch Normal file
View File

@ -0,0 +1,33 @@
From 53bb749a41bfb68fec3772aa6f7f7f7da9486c17 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 21 Jun 2022 14:57:30 +0800
Subject: [PATCH] fix compile error of ukui-search
---
libsearch/file-utils.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libsearch/file-utils.h b/libsearch/file-utils.h
index 6e8a617..43547ee 100644
--- a/libsearch/file-utils.h
+++ b/libsearch/file-utils.h
@@ -39,14 +39,14 @@
#include <QFontMetrics>
#include <QLabel>
-#include <quazip/quazipfile.h>
+#include <quazip5/quazipfile.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <quazip/quazip.h>
+#include <quazip5/quazip.h>
#include <uchardet/uchardet.h>
//#include <poppler-qt5.h>
#include <poppler/qt5/poppler-qt5.h>
--
2.33.0

55
0001-fix-coredump-of-ukui-search.patch
View File

@ -1,55 +0,0 @@
From 1bdde6b56b3d7812f6a8ed6dd26494a467f09f48 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 15 Jun 2023 18:27:12 +0800
Subject: [PATCH] fix coredump of ukui-search
---
libsearch/index/ocrobject.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libsearch/index/ocrobject.cpp b/libsearch/index/ocrobject.cpp
index 6d3d717..f9f9a6d 100644
--- a/libsearch/index/ocrobject.cpp
+++ b/libsearch/index/ocrobject.cpp
@@ -43,6 +43,9 @@ void OcrObject::getTxtContent(QString &path, QString &textcontent)
// }
//多进程版本
+ // set locale to "C" for tesseract
+ char *old_ctype = strdup(setlocale(LC_ALL, NULL));
+ setlocale(LC_ALL, "C");
//qDebug() << "path:" << path;
tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI();
if (api->Init(NULL, "chi_sim")) {
@@ -72,6 +75,9 @@ void OcrObject::getTxtContent(QString &path, QString &textcontent)
delete api;
api = nullptr;
}
+ // restore your previous locale
+ setlocale(LC_ALL, old_ctype);
+ free(old_ctype);
}
OcrObject::OcrObject(QObject *parent) : QObject(parent)
@@ -90,10 +96,18 @@ OcrObject::~OcrObject()
void OcrObject::init()
{
+ // set locale to "C" for tesseract
+ char *old_ctype = strdup(setlocale(LC_ALL, NULL));
+ setlocale(LC_ALL, "C");
+
m_api = new tesseract::TessBaseAPI();
if (m_api->Init(NULL, "chi_sim")) {
qDebug() << "Could not initialize tesseract.\n";
return;
}
m_api->SetVariable("user_defined_dpi", "1080");//图片中未标明分辨率的默认设置为1080
+
+ // restore your previous locale
+ setlocale(LC_ALL, old_ctype);
+ free(old_ctype);
}
--
2.33.0

61
0001-fix-incorrect-use-of-locally-implemented-vector.patch
View File

@ -1,61 +0,0 @@
From d685f09e034cc9632f3bdec89ba123f1e7c5e6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
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: 侯红勋 <houhongxun@kylinos.cn>
---
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 <sys/types.h>
#include <sys/stat.h>
#include <QDebug>
+#include <QVector>
#include <algorithm>
#include <utility>
@@ -92,7 +93,7 @@ inline std::ostream & operator << (std::ostream& os, const DatMemElem & elem) {
}
struct DatDag {
- limonp::LocalVector<pair<size_t, const DatMemElem *> > nexts;
+ QVector<pair<size_t, const DatMemElem *> > 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 <string>
#include <vector>
#include <ostream>
+#include <QVector>
#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<Rune> RuneArray;
-typedef limonp::LocalVector<struct RuneInfo> RuneStrArray;
+typedef QVector<Rune> RuneArray;
+typedef QVector<struct RuneInfo> RuneStrArray;
// [left, right]
struct WordRange {
--
2.43.0

BIN
ukui-search-0.4.2.tar.xz Normal file
View File

Binary file not shown.

BIN
ukui-search-3.1.tar.gz
View File

Binary file not shown.

111
ukui-search.spec
View File

@ -1,12 +1,13 @@
%define debug_package %{nil}
Name: ukui-search
Version: 3.1
Release: 5
Summary: a user-wide desktop search feature of UKUI desktop environment
Version: 0.4.2
Release: 3
Summary: Advanced ukui menu
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
Source0: %{name}-%{version}.tar.xz
Patch01: 0001-fix-compile-error-of-ukui-search.patch
BuildRequires: pkgconf
BuildRequires: gsettings-qt-devel
@ -22,106 +23,98 @@ BuildRequires: qt5-qtx11extras-devel
BuildRequires: uchardet-devel
BuildRequires: poppler-qt5-devel
BuildRequires: ukui-interface
BuildRequires: libqtxdg-devel
BuildRequires: libukcc-devel
BuildRequires: opencv
BuildRequires: tesseract-devel
Requires: libukui-search0 ukui-search-systemdbus quazip-qt5
%description
ukui-search is a user-wide desktop search feature of UKUI desktop environment
Portable, efficient middle-ware for different kinds of mail access
%package -n libchinese-segmentation0
Summary: Libraries for chinese-segmentation
Summary: libs
License: LGPLv2+
Provides: libchinese-segmentation
%description -n libchinese-segmentation0
Libraries for chinese-segmentation
.This package contains a few runtime libraries needed by
libsearch.
%package -n libchinese-segmentation-devel
Summary: Libraries for chinese-segmentation development
Requires: libchinese-segmentation0
%package -n libchinese-segmentation-dev
Summary: libs
License: LGPLv2+
Provides: libchinese-segmentation
%description -n libchinese-segmentation-devel
%{summary}.
%description -n libchinese-segmentation-dev
Libraries for chinese-segmentation
.This package contains a few runtime libraries needed by
libsearch.
%package -n libukui-search0
Summary: Libraries for ukui-search
Summary: libs
License: LGPLv2+
Provides: libukui-search
Requires: libchinese-segmentation0 ukui-search-systemdbus
%description -n libukui-search0
%{summary}.
Libraries for ukui-search
%package -n libukui-search-devel
Summary: Libraries for ukui-search(development files).
%package -n libukui-search-dev
Summary: libdevel
License: LGPLv2+
Requires: libukui-search0 libchinese-segmentation0 ukui-search-systemdbus
%description -n libukui-search-devel
%{summary}.
%description -n libukui-search-dev
Libraries for ukui-search(development files).
%package -n ukui-search-systemdbus
Summary: ukui-search-systemdbus is a systembus interface to modify max_user_watches nums permanent.
Summary: libdevel
License: LGPLv2+
%description -n ukui-search-systemdbus
%{summary}.
ukui-search-systemdbus is a systembus interface to modify max_user_watches nums
permanent.
%prep
%setup -q
%patch 1 -p1
%patch 2 -p1
%patch01 -p1
%build
mkdir build && cd build
%{qmake_qt5} ..
%{make_build}
cd ..
qmake-qt5 ..
make
%install
rm -rf $RPM_BUILD_ROOT
cd build
%{make_install} INSTALL_ROOT=%{buildroot}
cd %{_builddir}/%{name}-%{version}/build
make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}/usr/share/ukui-search/translations/
cp -r %{_builddir}/%{name}-%{version}/build/frontend/.qm/*.qm %{buildroot}/usr/share/ukui-search/translations/
cp -r %{_builddir}/%{name}-%{version}/build/libsearch/.qm/*.qm %{buildroot}/usr/share/ukui-search/translations/
cp -r %{_builddir}/%{name}-%{version}/build/search-ukcc-plugin/.qm/*.qm %{buildroot}/usr/share/ukui-search/search-ukcc-plugin/translations/
mkdir -p %{buildroot}/usr/share/ukui-search/translations
cp -r %{_builddir}/%{name}-%{version}/build/src/.qm/*.qm %{buildroot}/usr/share/ukui-search/translations/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%{_bindir}/ukui-search
%{_bindir}/ukui-search-service
%{_bindir}/ukui-search-app-data-service
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/ukui-search/translations/tr.qm
%{_datadir}/ukui-search/translations/bo.qm
%{_datadir}/ukui-search/translations/zh_CN.qm
%{_datadir}/ukui-search/translations/*.qm
%{_datadir}/glib-2.0/schemas/*.xml
%{_libdir}/ukui-control-center/*
%{_datadir}/ukui-search/search-ukcc-plugin/translations/*
%{_datadir}/ukui-search/search-ukcc-plugin/image/*
%{_includedir}/ukui-search/*.h
%files -n libchinese-segmentation0
%{_libdir}/libchinese-segmentation.so.*
%{_datadir}/ukui-search/res/dict/*
%{_datadir}/ukui-search/res/dict/*.utf8
%files -n libchinese-segmentation-devel
%files -n libchinese-segmentation-dev
%{_includedir}/chinese-seg/*
%{_libdir}/libchinese-segmentation.so
%files -n libukui-search0
%{_libdir}/libukui-search.so.*
%{_datadir}/ukui-search/translations/libukui-search_zh_CN.qm
%files -n libukui-search-devel
%files -n libukui-search-dev
%{_includedir}/ukui-search/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libukui-search.so
@ -132,24 +125,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Apr 30 2024 houhongxun <houhongxun@kylinos.cn> - 3.1-5
- fix incorrect use of self implemented vector
* Thu Jun 15 2023 peijiankang <peijiankang@kylinos.cn> - 3.1-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add 0001-fix-coredump-of-ukui-search.patch
* Fri Feb 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1-3
- add build debuginfo and debugsource
* Mon Jan 9 2023 peijiankang <peijiankang@kylinos.cn> - 3.1-2
- add search-ukcc-plugin translation files
* Tue Nov 1 2022 peijiankang <peijiankang@kylinos.cn> - 3.1-1
- update version to 3.1
* Wed Jun 22 2022 peijiankang <peijiankang@kylinos.cn> - 0.4.2-3
- fix install error