Merge pull request #47 from iaom/0104-dev

Add debian related files.

debian/changelog

@@ -0,0 +1,5 @@
+ukui-search (0.0.1+0104) v101; urgency=medium
+
+  * Initial release.
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn>  Mon, 04 Jan 2021 20:37:23 +0800

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,57 @@
+Source: ukui-search
+Section: utils
+Priority: optional
+Maintainer: zhangpengfei <zhangpengfei@kylinos.cn>
+Build-Depends: debhelper (>=9.0.0),
+               pkgconf,
+               libgsettings-qt-dev,
+               qtbase5-dev,
+               qt5-qmake,
+               qtchooser,
+               qtscript5-dev,
+               qttools5-dev-tools,
+               libxapian-dev,
+               libquazip5-dev,
+               libglib2.0-dev,
+               libgsettings-qt-dev
+Standards-Version: 4.5.0
+Homepage: https://www.ukui.org/
+Vcs-Git:  https://github.com/ukui/ukui-search.git
+Vcs-Browser: https://github.com/ukui/ukui-search
+
+Package: ukui-search
+Architecture: any
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends},
+         libukui-search0 (= ${binary:Version})
+Description: ukui-search is a user-wide desktop search 
+ feature of UKUI desktop environment.
+
+Package: libchinese-segmentation0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Provides: libchinese-segmentation,
+Description: Libraries for chinese-segmentation
+ .
+ This package contains a few runtime libraries needed by 
+ libsearch.
+
+Package: libukui-search0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libchinese-segmentation0 (= ${binary:Version})
+Provides: libukui-search,
+Description: Libraries for ukui-search. 
+
+Package: libukui-search-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libukui-search0 (= ${binary:Version}),
+         libchinese-segmentation0 (= ${binary:Version})
+Description: Libraries for  ukui-search(development files).

debian/libchinese-segmentation0.install

@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+/usr/share/ukui-search/res/dict/*.utf8

debian/libukui-search-dev.install

@@ -0,0 +1,2 @@
+usr/include/ukui-search/*
+usr/lib/*/*.so

debian/libukui-search0.install

@@ -0,0 +1 @@
+usr/lib/*/*.so.*

debian/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+# export QT_SELECT=5
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@ 
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

debian/ukui-search.install

@@ -0,0 +1 @@
+usr/bin/*

libchinese-segmentation/libchinese-segmentation.pro

@@ -1,6 +1,6 @@
 QT -= gui
 
-#VERSION = 0.0.1
+VERSION = 0.0.1
 TARGET =  chinese-segmentation
 TEMPLATE = lib
 DEFINES += LIBCHINESESEGMENTATION_LIBRARY

libsearch/libsearch.pro

@@ -48,9 +48,13 @@ RESOURCES += \
 
 # Default rules for deployment.
 unix {
-    target.path = /usr/lib
+    target.path = $$[QT_INSTALL_LIBS]
+    INSTALLS += target
+
+    header.path = /usr/include/ukui-search
+    header.files += libsearch.h
+    INSTALLS += header
 }
-!isEmpty(target.path): INSTALLS += target
 
 
 

src/main.cpp

@@ -50,23 +50,23 @@ int main(int argc, char *argv[])
     //load chinese character and pinyin file to a Map
     FileUtils::loadHanziTable("://index/pinyinWithoutTone.txt");
     /*-------------InotyifyRefact Test Start---------------*/
-//    QTime t1 = QTime::currentTime();
-//    InotifyManagerRefact* imr = new InotifyManagerRefact("/home");
-//    imr->start();
-//    QTime t2 = QTime::currentTime();
-//    qDebug() << t1;
-//    qDebug() << t2;
+    QTime t1 = QTime::currentTime();
+    InotifyManagerRefact* imr = new InotifyManagerRefact("/home");
+    imr->start();
+    QTime t2 = QTime::currentTime();
+    qDebug() << t1;
+    qDebug() << t2;
     /*-------------InotyifyRefact Test End-----------------*/
 
     /*-------------InotyifyRefact Test Start---------------*/
-//    QTime t1 = QTime::currentTime();
-//    FileTypeFilter* ftf = new FileTypeFilter("/home");
-//    ftf->Test();
-//    QTime t2 = QTime::currentTime();
-//    delete ftf;
-//    ftf = nullptr;
-//    qDebug() << t1;
-//    qDebug() << t2;
+    QTime t3 = QTime::currentTime();
+    FileTypeFilter* ftf = new FileTypeFilter("/home");
+    ftf->Test();
+    QTime t4 = QTime::currentTime();
+    delete ftf;
+    ftf = nullptr;
+    qDebug() << t3;
+    qDebug() << t4;
     /*-------------InotyifyRefact Test End-----------------*/
 
     /*-------------文本搜索 Test start-----------------*/

src/mainwindow.cpp

@@ -351,7 +351,7 @@ bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *r
 
     switch (event->response_type & ~0x80) {
     case XCB_FOCUS_OUT:
-        this->close();
+        this->hide();
         break;
     }
 

src/src.pro

@@ -57,7 +57,7 @@ qm_files.files = $$OUT_PWD/res/translations/*.qm
 INSTALLS += \
     qm_files \
 
-unix:!macx: LIBS += -L$$OUT_PWD/../libsearch -lukui-search -L../libchinese-segmentation/ -lchinese-segmentation
+LIBS += -L$$PWD/../libsearch -lukui-search -L$$PWD/../libchinese-segmentation/ -lchinese-segmentation
 
 INCLUDEPATH += $$PWD/../libsearch
 DEPENDPATH += $$PWD/../libsearch