diff --git a/0001-fix-function-virtual.patch b/0001-fix-function-virtual.patch new file mode 100644 index 0000000000000000000000000000000000000000..3ed187f209ca555764d06771ba1e9de3764755ca --- /dev/null +++ b/0001-fix-function-virtual.patch @@ -0,0 +1,136 @@ +From 2acafc8b0146d70cb19c61ed257b7fb0c4b569c1 Mon Sep 17 00:00:00 2001 +From: loong ci +Date: Thu, 21 Jul 2022 14:51:55 +0800 +Subject: [PATCH] fix function virtual + +--- + tests/src/displaycontent_test.cpp | 20 ++++++++++---------- + tests/src/logfileparser_test.cpp | 2 +- + tests/src/stub.h | 4 ++-- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/src/displaycontent_test.cpp b/tests/src/displaycontent_test.cpp +index 374c914..010f229 100644 +--- a/tests/src/displaycontent_test.cpp ++++ b/tests/src/displaycontent_test.cpp +@@ -95,7 +95,7 @@ TEST_F(DisplayContentlx_UT, exportClicked_UT) + m_content->selectFilter = "TEXT (*.txt)"; + stub.set(ADDR(QStandardPaths, writableLocation), stub_writableLocation); + stub.set(ADDR(QFileDialog, getSaveFileName), stub_getSaveFileName); +- stub.set(ADDR(QThreadPool, start), stub_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), stub_start); + m_content->m_flag = LOG_FLAG::BOOT; + m_content->slot_exportClicked(); + m_content->m_flag = LOG_FLAG::APP; +@@ -122,7 +122,7 @@ TEST_F(DisplayContentlx_UT, exportClicked_UT001) + m_content->selectFilter = "Html (*.html)"; + stub.set(ADDR(QStandardPaths, writableLocation), stub_writableLocation); + stub.set(ADDR(QFileDialog, getSaveFileName), stub_getSaveFileName); +- stub.set(ADDR(QThreadPool, start), stub_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), stub_start); + m_content->m_flag = LOG_FLAG::BOOT; + m_content->slot_exportClicked(); + m_content->m_flag = LOG_FLAG::APP; +@@ -149,7 +149,7 @@ TEST_F(DisplayContentlx_UT, exportClicked_UT002) + m_content->selectFilter = "Doc (*.doc)"; + stub.set(ADDR(QStandardPaths, writableLocation), stub_writableLocation); + stub.set(ADDR(QFileDialog, getSaveFileName), stub_getSaveFileName); +- stub.set(ADDR(QThreadPool, start), stub_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), stub_start); + m_content->m_flag = LOG_FLAG::BOOT; + m_content->slot_exportClicked(); + m_content->m_flag = LOG_FLAG::APP; +@@ -176,7 +176,7 @@ TEST_F(DisplayContentlx_UT, exportClicked_UT003) + m_content->selectFilter = "Xls (*.xls)"; + stub.set(ADDR(QStandardPaths, writableLocation), stub_writableLocation); + stub.set(ADDR(QFileDialog, getSaveFileName), stub_getSaveFileName); +- stub.set(ADDR(QThreadPool, start), stub_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), stub_start); + m_content->m_flag = LOG_FLAG::BOOT; + m_content->slot_exportClicked(); + m_content->m_flag = LOG_FLAG::APP; +@@ -203,7 +203,7 @@ TEST_F(DisplayContentlx_UT, exportClicked_UT004) + m_content->selectFilter = "Xls (*.xls)"; + stub.set(ADDR(QStandardPaths, writableLocation), stub_writableLocation); + stub.set(ADDR(QFileDialog, getSaveFileName), stub_getSaveFileName); +- stub.set(ADDR(QThreadPool, start), stub_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), stub_start); + m_content->m_flag = LOG_FLAG::BOOT; + m_content->slot_exportClicked(); + m_content->m_flag = LOG_FLAG::APP; +@@ -1223,7 +1223,7 @@ TEST(DisplayContent_slot_statusChagned_UT, DisplayContent_slot_statusChagned_UT_ + DisplayContent *p = new DisplayContent(nullptr); + EXPECT_NE(p, nullptr); + Stub stub; +- stub.set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub.set(ADDR(QThread, start), QThread_start); + p->slot_statusChagned("OK"); + p->deleteLater(); +@@ -1232,7 +1232,7 @@ TEST(DisplayContent_slot_statusChagned_UT, DisplayContent_slot_statusChagned_UT_ + TEST(DisplayContent_slot_dpkgFinished_UT, DisplayContent_slot_dpkgFinished_UT_001) + { + Stub stub; +- stub.set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub.set(ADDR(QThread, start), QThread_start); + DisplayContent *p = new DisplayContent(nullptr); + EXPECT_NE(p, nullptr); +@@ -1255,7 +1255,7 @@ TEST(DisplayContent_slot_dpkgFinished_UT, DisplayContent_slot_dpkgFinished_UT_00 + TEST(DisplayContent_slot_XorgFinished_UT, DisplayContent_slot_XorgFinished_UT_001) + { + Stub stub; +- stub.set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub.set(ADDR(QThread, start), QThread_start); + DisplayContent *p = new DisplayContent(nullptr); + EXPECT_NE(p, nullptr); +@@ -1541,7 +1541,7 @@ TEST_P(DisplayContent_slot_vScrollValueChanged_UT, DisplayContent_slot_vScrollVa + } + Stub stub; + stub.set(ADDR(LogTreeView, singleRowHeight), DisplayContent_slot_vScrollValueChanged_treeView_singleRowHeight_Func); +- stub.set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub.set(ADDR(QThread, start), QThread_start); + if (!param.isLastHeight) { + p->m_treeViewLastScrollValue = valuePixel; +@@ -1688,7 +1688,7 @@ TEST_P(DisplayContent_slot_searchResult_UT, DisplayContent_slot_searchResult_UT_ + DisplayContent_slot_searchResult_QString_contains = param.isContains; + Stub stub; + stub.set((bool (QString::*)(const QString &, Qt::CaseSensitivity) const)ADDR(QString, contains), DisplayContent_slot_searchResult_QString_contains_Func); +- stub.set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub.set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub.set(ADDR(QThread, start), QThread_start); + QString searchstr = param.isSearchEmpty ? "" : "testsearchstr"; + p->slot_searchResult(searchstr); +diff --git a/tests/src/logfileparser_test.cpp b/tests/src/logfileparser_test.cpp +index 779645e..f251a1c 100644 +--- a/tests/src/logfileparser_test.cpp ++++ b/tests/src/logfileparser_test.cpp +@@ -100,7 +100,7 @@ TEST(LogFileParser_Destructor_UT, LogFileParser_Destructor_UT) + TEST(LogFileParser_parseByJournalBoot_UT, LogFileParser_parseByJournalBoot_UT) + { + Stub *stub = new Stub; +- stub->set(ADDR(QThreadPool, start), QThreadPool_start); ++ stub->set((void (QThreadPool::*)(QRunnable *, int))ADDR(QThreadPool, start), QThreadPool_start); + stub->set(ADDR(QThread, start), QThread_start); + LogFileParser *p = new LogFileParser(nullptr); + EXPECT_NE(p, nullptr); +diff --git a/tests/src/stub.h b/tests/src/stub.h +index 76d6606..772045e 100644 +--- a/tests/src/stub.h ++++ b/tests/src/stub.h +@@ -37,8 +37,8 @@ + // br x9 + // addr + #define REPLACE_FAR(t, fn, fn_stub)\ +- ((uint32_t*)fn)[0] = 0x58000040 | 9;\ +- ((uint32_t*)fn)[1] = 0xd61f0120 | (9 << 5);\ ++ ((int*)fn)[0] = 0x58000040 | 9;\ ++ ((int*)fn)[1] = 0xd61f0120 | (9 << 5);\ + *(long long *)(fn + 8) = (long long )fn_stub;\ + CACHEFLUSH((char *)fn, CODESIZE); + #define REPLACE_NEAR(t, fn, fn_stub) REPLACE_FAR(t, fn, fn_stub) +-- +2.20.1 + diff --git a/deepin-log-viewer-5.8.0.23.tar.gz b/deepin-log-viewer-5.8.0.23.tar.gz deleted file mode 100644 index b2ee90b382593143e485a152edf38a32acd8eb6f..0000000000000000000000000000000000000000 Binary files a/deepin-log-viewer-5.8.0.23.tar.gz and /dev/null differ diff --git a/deepin-log-viewer-5.8.7.tar.gz b/deepin-log-viewer-5.8.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..274281d0f9fe771b485cf9c51b681e7dc4af67bf Binary files /dev/null and b/deepin-log-viewer-5.8.7.tar.gz differ diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index f12ba4c471754a1a56669b83f4a2874fb01456c4..9e6bd812549b21b352f0f44dfadc8017ca6c2ae1 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,50 +1,86 @@ -Name: deepin-log-viewer -Version: 5.8.0.23 -Release: 2 -Summary: Log Viewer is a useful tool for viewing system logs. +%define pkgrelease 1 +%if 0%{?openeuler} +%define specrelease %{pkgrelease} +%else +## allow specrelease to have configurable %%{?dist} tag in other distribution +%define specrelease %{pkgrelease}%{?dist} +%endif + +Name: deepin-log-viewer +Version: 5.8.7 +Release: %{specrelease} +Summary: Log Viewer is a useful tool for viewing system logs License: GPLv3+ -URL: https://github.com/linuxdeepin/deepin-log-viewer +URL: https://github.com/linuxdeepin/%{name} Source0: %{name}-%{version}.tar.gz -patch0: modify-QPainterPath-error.patch +Patch0: 0001-fix-function-virtual.patch +BuildRequires: qt5-devel BuildRequires: gcc-c++ BuildRequires: cmake3 BuildRequires: dtkcore-devel BuildRequires: dtkwidget-devel +BuildRequires: dtkgui-devel BuildRequires: systemd-devel BuildRequires: libicu-devel -BuildRequires: qt5-devel +BuildRequires: qt5-rpm-macros +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: kf5-kcodecs-devel +BuildRequires: libzip-devel +BuildRequires: xerces-c-devel +BuildRequires: boost-devel +BuildRequires: minizip-devel +BuildRequires: rapidjson-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: fftw-libs BuildRequires: qt5-qtbase-private-devel + %description -%{summary}. +Log Viewer is a useful tool for viewing system logs. %prep %autosetup -p1 %build -# help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") -mkdir build && pushd build -%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} -%make_build +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} +%make_build popd %install %make_install -C build INSTALL_ROOT="%buildroot" + + %files +%doc README.md %license LICENSE %{_bindir}/%{name} %{_bindir}/logViewerAuth %{_bindir}/logViewerTruncate %{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/translations/%{name}* +%{_datadir}/%{name}/translations/*.qm %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/polkit-1/actions/*.policy +%{_datadir}/deepin-manual/manual-assets/application/deepin-log-viewer/log-viewer/* +/usr/lib/deepin-daemon/logViewerService +/usr/share/dbus-1/system-services/com.deepin.logviewer.service +/usr/share/dbus-1/system.d/com.deepin.logviewer.conf +%{_datadir}/%{name}/DocxTemplate/*.dfw + + %changelog +* Tue Jul 19 2022 konglidong - 5.8.7-1 +- update to 5.8.7 + * Mon Feb 07 2022 liweigang - 5.8.0.23-2 - fix build error diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index 720410dfe64ca40178655d9681054aea43e52a7f..0000000000000000000000000000000000000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --color -Naur a/application/filtercontent.cpp b/application/filtercontent.cpp ---- a/application/filtercontent.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/filtercontent.cpp 2022-02-07 16:21:44.331905565 +0800 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --color -Naur a/application/logdetailinfowidget.cpp b/application/logdetailinfowidget.cpp ---- a/application/logdetailinfowidget.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/logdetailinfowidget.cpp 2022-02-07 16:20:52.611208915 +0800 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include "structdef.h" -diff --color -Naur a/application/logperiodbutton.cpp b/application/logperiodbutton.cpp ---- a/application/logperiodbutton.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/logperiodbutton.cpp 2022-02-07 16:19:56.846400575 +0800 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - DWIDGET_USE_NAMESPACE -diff --color -Naur a/application/logtreeview.cpp b/application/logtreeview.cpp ---- a/application/logtreeview.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/logtreeview.cpp 2022-02-07 16:22:34.720539978 +0800 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include "structdef.h" - -diff --color -Naur a/application/logviewheaderview.cpp b/application/logviewheaderview.cpp ---- a/application/logviewheaderview.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/logviewheaderview.cpp 2022-02-07 16:21:23.147626057 +0800 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "logviewheaderview.h" - -diff --color -Naur a/application/logviewitemdelegate.cpp b/application/logviewitemdelegate.cpp ---- a/application/logviewitemdelegate.cpp 2022-02-07 16:19:13.701730243 +0800 -+++ b/application/logviewitemdelegate.cpp 2022-02-07 16:20:25.098817915 +0800 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #include "logviewitemdelegate.h"