Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-system-monitor for
openSUSE:Factory checked in at 2024-08-16 12:23:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-system-monitor"
Fri Aug 16 12:23:54 2024 rev:20 rq:1194141 version:5.8.27
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2024-05-31 22:21:13.097640287 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2698/deepin-system-monitor.changes
2024-08-16 12:24:29.601135103 +0200
@@ -1,0 +2,5 @@
+Thu Aug 15 13:16:03 UTC 2024 - Hillwood Yang <hillw...@opensuse.org>
+
+- Add fix-procps-link.patch, backport support for procps 4.0
+
+-------------------------------------------------------------------
New:
----
fix-procps-link.patch
BETA DEBUG BEGIN:
New:
- Add fix-procps-link.patch, backport support for procps 4.0
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.gyUJNX/_old 2024-08-16 12:24:30.185159374 +0200
+++ /var/tmp/diff_new_pack.gyUJNX/_new 2024-08-16 12:24:30.185159374 +0200
@@ -38,6 +38,10 @@
Patch0: fix-return-type-errors.patch
# PATCH-FIX-UPSTREAN fix-c++17.patch hillw...@opensuse.org - ICU 75 needs c++17
Patch1: fix-c++17.patch
+%if 0%{?suse_version} > 1500
+# PATCH-FOR-OPENSUSE fix-procps-link.patch hillw...@opensuse.org - Backport
support for procps 4.0
+Patch2: fix-procps-link.patch
+%endif
%ifarch ppc ppc64 ppc64le s390 s390x
BuildRequires: deepin-desktop-base
%else
++++++ fix-procps-link.patch ++++++
diff -Nur deepin-system-monitor-5.8.27/src/CMakeLists.txt
deepin-system-monitor-5.8.27-new/src/CMakeLists.txt
--- deepin-system-monitor-5.8.27/src/CMakeLists.txt 2022-05-31
14:13:04.000000000 +0800
+++ deepin-system-monitor-5.8.27-new/src/CMakeLists.txt 2024-08-15
21:12:32.547955768 +0800
@@ -26,13 +26,16 @@
find_package(DtkCore REQUIRED)
find_package(DtkGui REQUIRED)
find_package(DtkWidget REQUIRED)
+find_package(PkgConfig 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_XCB NAMES xcb REQUIRED)
find_library(LIB_XEXT NAMES Xext REQUIRED)
find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
find_package(ICU COMPONENTS i18n uc REQUIRED)
+pkg_check_modules(PROCPS REQUIRED IMPORTED_TARGET libproc2)
+
pkg_search_module(LIB_NL3 REQUIRED libnl-3.0)
pkg_search_module(LIB_NL3_ROUTE REQUIRED libnl-route-3.0)
pkg_search_module(LIB_UDEV REQUIRED libudev)
@@ -537,7 +540,7 @@
dtkwidget
dtkgui
${LIB_PCAP}
- ${LIB_PROCPS}
+ PkgConfig::PROCPS
ICU::i18n
ICU::uc
${LIB_XCB}
