fix xorg application log problem
This commit is contained in:
liuzhilin
parent
0c6e03d81b
commit
db2c0d2d04
22
0001-fix-xorg-application-log-problem.patch
Normal file
22
0001-fix-xorg-application-log-problem.patch
Normal file
@ -0,0 +1,22 @@
|
||||
From 5bfbde1f2b01d7d5a30b5343c72bac7b76b92467 Mon Sep 17 00:00:00 2001
|
||||
From: Super User <root@localhost.localdomain>
|
||||
Date: Thu, 21 Sep 2023 16:41:47 +0800
|
||||
Subject: [PATCH] fix xorg application log problem
|
||||
|
||||
---
|
||||
logViewerService/assets/data/com.deepin.logviewer.service | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/logViewerService/assets/data/com.deepin.logviewer.service b/logViewerService/assets/data/com.deepin.logviewer.service
|
||||
index 41f0cca..d331f89 100755
|
||||
--- a/logViewerService/assets/data/com.deepin.logviewer.service
|
||||
+++ b/logViewerService/assets/data/com.deepin.logviewer.service
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=com.deepin.logviewer
|
||||
-Exec=/usr/lib/deepin-daemon/log-view-service
|
||||
+Exec=/usr/bin/log-view-service
|
||||
User=root
|
||||
--
|
||||
2.41.0
|
||||
|
||||
43
0002-add-boot.log-file-judge.patch
Normal file
43
0002-add-boot.log-file-judge.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 0446e0e9e20e2deac880600053fc79a23ba5340e Mon Sep 17 00:00:00 2001
|
||||
From: Super User <root@localhost.localdomain>
|
||||
Date: Thu, 21 Sep 2023 18:32:29 +0800
|
||||
Subject: [PATCH 2/2] add boot.log file judge
|
||||
|
||||
---
|
||||
application/loglistview.cpp | 20 +++++++++++---------
|
||||
1 file changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/application/loglistview.cpp b/application/loglistview.cpp
|
||||
index 1e44d72..e426367 100644
|
||||
--- a/application/loglistview.cpp
|
||||
+++ b/application/loglistview.cpp
|
||||
@@ -197,15 +197,17 @@ void LogListView::initUI()
|
||||
m_pModel->appendRow(item);
|
||||
m_logTypes.push_back(BOOT_KLU_TREE_DATA);
|
||||
} else {
|
||||
- item = new QStandardItem(QIcon::fromTheme("dp_start"), DApplication::translate("Tree", "Boot Log"));
|
||||
- setIconSize(QSize(ICON_SIZE, ICON_SIZE));
|
||||
- item->setToolTip(DApplication::translate("Tree", "Boot Log")); // add by Airy for bug 16245
|
||||
- item->setData(BOOT_TREE_DATA, ITEM_DATE_ROLE);
|
||||
- item->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT));
|
||||
- item->setData(VListViewItemMargin, Dtk::MarginsRole);
|
||||
- item->setAccessibleText("Boot Log");
|
||||
- m_pModel->appendRow(item);
|
||||
- m_logTypes.push_back(BOOT_TREE_DATA);
|
||||
+ if (isFileExist("/var/log/boot.log")) {
|
||||
+ item = new QStandardItem(QIcon::fromTheme("dp_start"), DApplication::translate("Tree", "Boot Log"));
|
||||
+ setIconSize(QSize(ICON_SIZE, ICON_SIZE));
|
||||
+ item->setToolTip(DApplication::translate("Tree", "Boot Log")); // add by Airy for bug 16245
|
||||
+ item->setData(BOOT_TREE_DATA, ITEM_DATE_ROLE);
|
||||
+ item->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT));
|
||||
+ item->setData(VListViewItemMargin, Dtk::MarginsRole);
|
||||
+ item->setAccessibleText("Boot Log");
|
||||
+ m_pModel->appendRow(item);
|
||||
+ m_logTypes.push_back(BOOT_TREE_DATA);
|
||||
+ }
|
||||
}
|
||||
if (isCentos) {
|
||||
item = new QStandardItem(QIcon::fromTheme("dp_d"), DApplication::translate("Tree", "dnf Log"));
|
||||
--
|
||||
2.41.0
|
||||
|
||||
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
||||
# deepin-log-viewer
|
||||
|
||||
#### Description
|
||||
deepin log viewer
|
||||
|
||||
#### Software Architecture
|
||||
Software architecture description
|
||||
|
||||
#### Installation
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Instructions
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### Gitee Feature
|
||||
|
||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
37
README.md
37
README.md
@ -1,37 +0,0 @@
|
||||
# deepin-log-viewer
|
||||
|
||||
#### 介绍
|
||||
deepin log viewer
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 码云特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
|
||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
|
||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
@ -1,4 +1,4 @@
|
||||
%define pkgrelease 1
|
||||
%define pkgrelease 2
|
||||
%if 0%{?openeuler}
|
||||
%define specrelease %{pkgrelease}
|
||||
%else
|
||||
@ -14,6 +14,8 @@ License: GPLv3+
|
||||
URL: https://github.com/linuxdeepin/%{name}
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: 0001-feat-round-master-function.patch
|
||||
Patch1: 0001-fix-xorg-application-log-problem.patch
|
||||
Patch2: 0002-add-boot.log-file-judge.patch
|
||||
|
||||
BuildRequires: qt5-devel
|
||||
BuildRequires: gcc-c++
|
||||
@ -50,17 +52,19 @@ Log Viewer is a useful tool for viewing system logs.
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%build
|
||||
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
|
||||
|
||||
popd
|
||||
|
||||
%install
|
||||
%make_install -C build INSTALL_ROOT="%buildroot"
|
||||
|
||||
cp %buildroot/usr/lib/deepin-daemon/log-view-service %buildroot/usr/bin/log-view-service
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
@ -73,6 +77,7 @@ popd
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_datadir}/polkit-1/actions/*.policy
|
||||
%{_datadir}/deepin-manual/manual-assets/application/deepin-log-viewer/log-viewer/*
|
||||
/usr/bin/log-view-service
|
||||
/usr/lib/deepin-daemon/log-view-service
|
||||
/usr/share/dbus-1/system-services/com.deepin.logviewer.service
|
||||
/usr/share/dbus-1/system.d/com.deepin.logviewer.conf
|
||||
@ -80,6 +85,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 21 2023 hanshuang <hanshuang@uniontech.com> - 5.9.13-2
|
||||
- fix xorg application log problem
|
||||
|
||||
* Wed Jul 26 2023 leeffo <liweiganga@uniontech.com> - 5.9.13-1
|
||||
- upgrade to version 5.9.13
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user