Merge pull request #140 from iaom/0219-dev

Update debian/changelog and debian/control.

debian/changelog

@@ -1,3 +1,11 @@
+ukui-search (0.1.1+0219-1) v101; urgency=medium
+
+  * Remove QWebEngineView dependence.
+  * Remove friso dependence.
+  * Update debian/control.
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn>  Fri, 19 Feb 2021 11:37:16 +0800
+
 ukui-search (0.1.0+0207) v101; urgency=medium
 
   * Fix: Index error when there are too much files in user directory.

debian/control

@@ -11,13 +11,12 @@ Build-Depends: debhelper (>=9.0.0),
                qtscript5-dev,
                qttools5-dev-tools,
                libxapian-dev,
-               libquazip5-dev,
+               libquazip5-dev(>=0.7.6-6build1),
                libglib2.0-dev,
                libkf5windowsystem-dev,
                libgsettings-qt-dev,
                libqt5x11extras5-dev,
-               libuchardet-dev,
-               qtwebengine5-dev
+               libuchardet-dev
 Standards-Version: 4.5.0
 Homepage: https://www.ukui.org/
 Vcs-Git:  https://github.com/ukui/ukui-search.git

libsearch/libsearch.pro

@@ -68,8 +68,8 @@ unix {
 INCLUDEPATH += $$PWD/../libchinese-segmentation
 DEPENDPATH += $$PWD/../libchinese-segmentation
 
-INCLUDEPATH += $$PWD/../libfriso
-DEPENDPATH += $$PWD/../libfriso
+#INCLUDEPATH += $$PWD/../libfriso
+#DEPENDPATH += $$PWD/../libfriso
 
 #DISTFILES += \
 #    ../translations/libsearch/libukui-search_zh_CN.ts

src/control/search-detail-view.h

@@ -22,7 +22,7 @@
 #define SEARCHDETAILVIEW_H
 
 #include <QWidget>
-#include <QWebEngineView>
+//#include <QWebEngineView>
 #include "option-view.h"
 
 class SearchDetailView : public QWidget

src/src.pro

@@ -1,4 +1,4 @@
-QT       += core gui dbus  KWindowSystem xml x11extras webenginewidgets
+QT       += core gui dbus  KWindowSystem xml x11extras
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -67,14 +67,14 @@ qm_files.files = $$OUT_PWD/.qm/*.qm
 INSTALLS += qm_files
 
 LIBS += -L$$OUT_PWD/../libsearch -lukui-search \
-        -L$$OUT_PWD/../libchinese-segmentation -lchinese-segmentation \
-        -L$$OUT_PWD/../libfriso -lfriso
+        -L$$OUT_PWD/../libchinese-segmentation -lchinese-segmentation
+#        -L$$OUT_PWD/../libfriso -lfriso
 
 INCLUDEPATH += $$PWD/../libsearch
 DEPENDPATH += $$PWD/../libsearch
 
-INCLUDEPATH += $$PWD/../libfriso
-DEPENDPATH += $$PWD/../libfriso
+#INCLUDEPATH += $$PWD/../libfriso
+#DEPENDPATH += $$PWD/../libfriso
 
 #DISTFILES += \
 #    ../data/ukui-search-menu.desktop \

ukui-search.pro

@@ -2,8 +2,8 @@ TEMPLATE = subdirs
 SUBDIRS += $$PWD/libchinese-segmentation \
            $$PWD/libsearch \
            $$PWD/src \
-           $$PWD/ukuisearch-systemdbus \
-           $$PWD/libfriso
+           $$PWD/ukuisearch-systemdbus
+#           $$PWD/libfriso
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -15,8 +15,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-libsearch.depends += libchinese-segmentation \
-                     libfriso
+libsearch.depends += libchinese-segmentation
+#                     libfriso
 src.depends = libsearch
 
 CONFIG += ordered