From c400d0046549e45cccdae9cd50bbf9fa49a946f3 Mon Sep 17 00:00:00 2001 From: yuanxing Date: Mon, 19 Jun 2023 09:27:48 +0800 Subject: [PATCH] fix(cpuinfo):remove "add cpuinfo" patch to get correct cpuinfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除"add cpuinfo"补丁来获取正确cpu信息 --- mate-system-monitor-add-cpuinfo.patch | 15 --------------- mate-system-monitor.spec | 7 ++++--- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 mate-system-monitor-add-cpuinfo.patch diff --git a/mate-system-monitor-add-cpuinfo.patch b/mate-system-monitor-add-cpuinfo.patch deleted file mode 100644 index bdace17..0000000 --- a/mate-system-monitor-add-cpuinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur mate-system-monitor-1.22.2/src/sysinfo.cpp mate-system-monitor-1.22.2-b/src/sysinfo.cpp ---- mate-system-monitor-1.22.2/src/sysinfo.cpp 2019-09-22 22:08:46.000000000 +0800 -+++ mate-system-monitor-1.22.2-b/src/sysinfo.cpp 2020-01-07 15:35:03.326925915 +0800 -@@ -920,8 +920,10 @@ - g_free(markup); - - markup = NULL; -+ //add_row(GTK_GRID(hardware_table), _("Processor:"), -+ // data->processors.c_str(), 1); - add_row(GTK_GRID(hardware_table), _("Processor:"), -- data->processors.c_str(), 1); -+ "96x ARM", 1); - - if(markup) - g_free(markup); diff --git a/mate-system-monitor.spec b/mate-system-monitor.spec index c87189e..8f19034 100644 --- a/mate-system-monitor.spec +++ b/mate-system-monitor.spec @@ -1,13 +1,11 @@ Name: mate-system-monitor Version: 1.22.2 -Release: 6 +Release: 7 Summary: Process and resource monitor License: GPLv2+ URL: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz -Patch0: mate-system-monitor-add-cpuinfo.patch - Patch1001: 0001-kylin-modify-desktop.patch Patch1002: 0001-modify-mate-system-monitor.desktop.in.in.patch Patch1003: 0002-modify-mate-system-monitor.desktop.in.patch @@ -72,6 +70,9 @@ desktop-file-install --delete-original \ %changelog +* Thu Aug 04 2022 yuanxing - 1.22.2-7 +- KYOS-F: remove "add cpuinfo" patch to get correct cpu info + * Thu Aug 04 2022 yuanxing - 1.22.2-6 - KYOS-F: merge two patch of fix resource page too large and add cpu color in gschema.xml when system has too many cpus