packages/deepin-system-monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 [sync] PR-11: fix build errors

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-11-30 05:24:52 +00:00 committed by Gitee
commit d056014b33
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-procps-ng-update-4.0.0.patch Normal file
View File

@ -0,0 +1,25 @@
From 388df3fe9ed94a5c3aad00a15e9f1447ffac4139 Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Fri, 11 Nov 2022 14:50:33 +0800
Subject: [PATCH] procps-ng update 4.0.0
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a09f02..42e55fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package(DtkCore REQUIRED)
find_package(DtkGui REQUIRED)
find_package(DtkWidget REQUIRED)
find_library(LIB_PCAP NAMES pcap REQUIRED)
-find_library(LIB_PROCPS NAMES procps REQUIRED)
+find_library(LIB_PROCPS NAMES proc-2 REQUIRED)
find_library(LIB_XCB NAMES xcb REQUIRED)
find_library(LIB_XEXT NAMES Xext REQUIRED)
find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
--
2.20.1

10
deepin-system-monitor.spec
View File

@ -1,5 +1,5 @@
%global debug_package %{nil} %global debug_package %{nil}
%define pkgrelease 1 %define pkgrelease 2
%if 0%{?openeuler} %if 0%{?openeuler}
%define specrelease %{pkgrelease} %define specrelease %{pkgrelease}
%else %else
@ -15,6 +15,7 @@ Summary: A more user-friendly system monitor
License: GPLv3 License: GPLv3
URL: https://github.com/linuxdeepin/deepin-system-monitor URL: https://github.com/linuxdeepin/deepin-system-monitor
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-procps-ng-update-4.0.0.patch
BuildRequires: qt5-devel BuildRequires: qt5-devel
BuildRequires: cmake BuildRequires: cmake
@ -24,7 +25,7 @@ BuildRequires: dtkcore-devel
BuildRequires: pkgconfig(dtkgui) BuildRequires: pkgconfig(dtkgui)
# BuildRequires: pkgconfig(dtkwm) # BuildRequires: pkgconfig(dtkwm)
BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(libproc-2)
BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
@ -58,7 +59,7 @@ Recommends: deepin-manual
%{summary}. %{summary}.
%prep %prep
%autosetup %autosetup -p1
# %setup -q # %setup -q
####sed -i 's|lrelease|lrelease-qt5|' translations/translate_generation.sh ####sed -i 's|lrelease|lrelease-qt5|' translations/translate_generation.sh
@ -104,6 +105,9 @@ fi
%{_datadir}/deepin-manual/manual-assets/application/deepin-system-monitor/system-monitor/* %{_datadir}/deepin-manual/manual-assets/application/deepin-system-monitor/system-monitor/*
%changelog %changelog
* Fri Nov 11 2022 liweigang <liweiganga@uniontech.com> - 5.8.11-2
- feat: procps-ng update 4.0.0
* Tue Jul 19 2022 konglidong <konglidong@uniontech.com> - 5.8.11-1 * Tue Jul 19 2022 konglidong <konglidong@uniontech.com> - 5.8.11-1
- update to 5.8.11 - update to 5.8.11