From 096e3f5ac013e644fcb6f3ec34860d926d0489ac Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Tue, 28 May 2024 16:50:02 +0800 Subject: [PATCH] LIB_PROC2 replaces LIB_PROCPS with procps-ng update --- 0001-procps-ng-update-4.0.0.patch | 24 ++++++++++++++---------- deepin-system-monitor.spec | 7 +++++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/0001-procps-ng-update-4.0.0.patch b/0001-procps-ng-update-4.0.0.patch index 67152bf..0f56059 100644 --- a/0001-procps-ng-update-4.0.0.patch +++ b/0001-procps-ng-update-4.0.0.patch @@ -1,25 +1,29 @@ -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 +From cf4796c5640ac65ef048d198a09a7a8e61343a38 Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Wed, 29 May 2024 15:49:27 +0800 +Subject: [PATCH] test --- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3a09f02..42e55fb 100644 +index 1f46735..a72f622 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -27,7 +27,7 @@ find_package(DtkCore REQUIRED) +@@ -27,7 +27,11 @@ 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 proc2 REQUIRED) ++if(EXISTS /usr/lib64/libproc2.so) ++ set(LIB_PROC2 /usr/lib64/libproc2.so CACHE FILEPATH "Path to a library." ) ++else() ++ set(LIB_PROC2 LIB_PROC2-NOTFOUND CACHE FILEPATH "Path to a library." ) ++endif() 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 +2.43.0 diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 95a9a3d..b549df7 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%define pkgrelease 5 +%define pkgrelease 6 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -68,7 +68,7 @@ Recommends: deepin-manual %build export PATH=%{_qt5_bindir}:$PATH -sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +sed -i -e "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 @@ -106,6 +106,9 @@ fi %{_datadir}/deepin-manual/manual-assets/application/deepin-system-monitor/system-monitor/* %changelog +* Tue May 28 2024 zhangxianting - 5.8.11-6 +- LIB_PROC2 replaces LIB_PROCPS with procps-ng update + * Wed Mar 15 2023 liweiganga - 5.8.11-5 - feat: fix strip -- Gitee