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

!18 【轻量级 PR】：Update changes due to procps-ng upgrade

Browse Source 
From: @leeffo 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2023-02-10 08:46:57 +00:00 committed by Gitee
commit 8192235223
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-procps-ng-update-4.0.0.patch
View File

@ -16,7 +16,7 @@ index 3a09f02..42e55fb 100644
find_package(DtkWidget REQUIRED) find_package(DtkWidget REQUIRED)
find_library(LIB_PCAP NAMES pcap REQUIRED) find_library(LIB_PCAP NAMES pcap REQUIRED)
-find_library(LIB_PROCPS NAMES procps REQUIRED) -find_library(LIB_PROCPS NAMES procps REQUIRED)
+find_library(LIB_PROCPS NAMES proc-2 REQUIRED) +find_library(LIB_PROCPS NAMES proc2 REQUIRED)
find_library(LIB_XCB NAMES xcb REQUIRED) find_library(LIB_XCB NAMES xcb REQUIRED)
find_library(LIB_XEXT NAMES Xext REQUIRED) find_library(LIB_XEXT NAMES Xext REQUIRED)
find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED) find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)

7
deepin-system-monitor.spec
View File

@ -1,5 +1,5 @@
##%global debug_package %{nil} ##%global debug_package %{nil}
%define pkgrelease 3 %define pkgrelease 4
%if 0%{?openeuler} %if 0%{?openeuler}
%define specrelease %{pkgrelease} %define specrelease %{pkgrelease}
%else %else
@ -25,7 +25,7 @@ BuildRequires: dtkcore-devel
BuildRequires: pkgconfig(dtkgui) BuildRequires: pkgconfig(dtkgui)
# BuildRequires: pkgconfig(dtkwm) # BuildRequires: pkgconfig(dtkwm)
BuildRequires: pkgconfig(libproc-2) BuildRequires: procps-ng-devel
BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
@ -105,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 Feb 10 2023 liweiganga <liweiganga@uniontech.com> - 5.8.11-4
- feat: update changes due to procps-ng upgrade
* Wed Dec 21 2022 liweigang <liweiganga@uniontech.com> - 5.8.11-3 * Wed Dec 21 2022 liweigang <liweiganga@uniontech.com> - 5.8.11-3
- enable debuginfo for fix strip - enable debuginfo for fix strip