From 22cdc1fb30454bde6084d63a172993d0cf89f5c6 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Fri, 11 Nov 2022 10:08:35 +0800 Subject: [PATCH] procps-ng update 4.0.0 --- 0001-procps-ng-update-4.0.0.patch | 25 +++++++++++++++++++++++++ deepin-system-monitor.spec | 10 +++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 0001-procps-ng-update-4.0.0.patch diff --git a/0001-procps-ng-update-4.0.0.patch b/0001-procps-ng-update-4.0.0.patch new file mode 100644 index 0000000..c497ad6 --- /dev/null +++ b/0001-procps-ng-update-4.0.0.patch @@ -0,0 +1,25 @@ +From 388df3fe9ed94a5c3aad00a15e9f1447ffac4139 Mon Sep 17 00:00:00 2001 +From: leeffo +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 + diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index ab6542c..64c0922 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%define pkgrelease 1 +%define pkgrelease 2 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -15,6 +15,7 @@ Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-procps-ng-update-4.0.0.patch BuildRequires: qt5-devel BuildRequires: cmake @@ -24,7 +25,7 @@ BuildRequires: dtkcore-devel BuildRequires: pkgconfig(dtkgui) # BuildRequires: pkgconfig(dtkwm) -BuildRequires: pkgconfig(libprocps) +BuildRequires: pkgconfig(libproc-2) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(x11) @@ -58,7 +59,7 @@ Recommends: deepin-manual %{summary}. %prep -%autosetup +%autosetup -p1 # %setup -q ####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/* %changelog +* Fri Nov 11 2022 liweigang - 5.8.11-2 +- feat: procps-ng update 4.0.0 + * Tue Jul 19 2022 konglidong - 5.8.11-1 - update to 5.8.11 -- Gitee