!38 fix build error

From: @lliuzhi 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang
This commit is contained in:
openeuler-ci-bot 2024-04-12 09:15:34 +00:00 committed by Gitee
commit 4607dc7c91
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 8 deletions

View File

@ -0,0 +1,41 @@
From bcb66e042058c44dc3b2018ddfb2ce41e6bdc079 Mon Sep 17 00:00:00 2001
From: liuzhilin <liuzhilin@uniontech.com>
Date: Fri, 12 Apr 2024 16:31:04 +0800
Subject: [PATCH] fix-build-error
---
deepin-system-monitor-main/CMakeLists.txt | 3 +++
deepin-system-monitor-plugin-popup/CMakeLists.txt | 3 +++
2 files changed, 6 insertions(+)
diff --git a/deepin-system-monitor-main/CMakeLists.txt b/deepin-system-monitor-main/CMakeLists.txt
index 035dad5..0f95bf2 100644
--- a/deepin-system-monitor-main/CMakeLists.txt
+++ b/deepin-system-monitor-main/CMakeLists.txt
@@ -68,6 +68,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libsmartcols/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
+include_directories(/usr/include/dtk5/DWidget/)
+include_directories(/usr/include/dtk5/DCore/)
+include_directories(/usr/include/dtk5/DGui/)
#安全测试加固编译参数
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
diff --git a/deepin-system-monitor-plugin-popup/CMakeLists.txt b/deepin-system-monitor-plugin-popup/CMakeLists.txt
index c430c98..0d0f7f8 100644
--- a/deepin-system-monitor-plugin-popup/CMakeLists.txt
+++ b/deepin-system-monitor-plugin-popup/CMakeLists.txt
@@ -278,6 +278,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC
# ${Qt5Widgets_INCLUDE_DIRS}
# ${DtkWidget_INCLUDE_DIRS}
${DdeDockInterface_INCLUDE_DIRS}
+ /usr/include/dtk5/DWidget/
+ /usr/include/dtk5/DCore/
+ /usr/include/dtk5/DGui/
)
target_link_libraries(${PROJECT_NAME}
Qt5::Core
--
2.39.3

View File

@ -1,16 +1,9 @@
%global debug_package %{nil}
%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-system-monitor
Version: 5.9.31
Release: %{specrelease}
Release: 2
Summary: A more user-friendly system monitor
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-system-monitor
@ -18,6 +11,7 @@ Source0: %{name}-%{version}.tar.gz
Patch0: 0001-procps-ng-update-4.0.0.patch
Patch1: 0002-Remove-all-symbol-table-and-relocation-information-f.patch
Patch2: 0003-feat-add-build-option-to-disable-wayland-support.patch
Patch3: 0001-fix-build-error.patch
BuildRequires: qt5-devel
BuildRequires: cmake
@ -122,6 +116,9 @@ fi
%changelog
* Fri Apr 12 2024 liuzhilin <liuzhilin@uniontech.com> - 5.9.31-2
- fix-build-error
* Mon Jul 24 2023 leeffo <liweiganga@uniontech.com> - 5.9.31-1
- upgrade to version 5.9.31