fix: 设备管理器中内存单位与终端中输入dmidecode17查询的内存速率单位不符合

Signed-off-by: liweigang <liweiganga@uniontech.com>

0001-fix-dmidecode17.patch

@@ -0,0 +1,42 @@
+From cd14618b9dc8fce8a22cac9b17ccc96f2d36301d Mon Sep 17 00:00:00 2001
+From: liweigang <izmirvii@gmail.com>
+Date: Fri, 22 Mar 2024 16:30:50 +0800
+Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
+ =?UTF-8?q?=E5=99=A8=E4=B8=AD=E5=86=85=E5=AD=98=E5=8D=95=E4=BD=8D=E4=B8=8E?=
+ =?UTF-8?q?=E7=BB=88=E7=AB=AF=E4=B8=AD=E8=BE=93=E5=85=A5dmidecode17?=
+ =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=86=85=E5=AD=98=E9=80=9F=E7=8E=87?=
+ =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=8D=E7=AC=A6=E5=90=88?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: liweigang <izmirvii@gmail.com>
+---
+ deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+index 8d559de..8f95f25 100644
+--- a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
++++ b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+@@ -35,8 +35,6 @@ void DeviceMemory::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
+ 
+     // 设置内存速率
+     setAttribute(mapInfo, "clock", m_Speed);
+-    if (m_Speed.contains("MT/s"))
+-        m_Speed.replace("MT/s", "MHz");
+ 
+     // 由lshw设置基本信息
+     setAttribute(mapInfo, "width", m_TotalBandwidth);
+@@ -58,8 +56,6 @@ bool DeviceMemory::setInfoFromDmidecode(const QMap<QString, QString> &mapInfo)
+ 
+     // 设置配置频率
+     setAttribute(mapInfo, "Configured Memory Speed", m_ConfiguredSpeed);
+-    if (m_ConfiguredSpeed.contains("MT/s"))
+-        m_ConfiguredSpeed.replace("MT/s", "MHz");
+ 
+     // 由dmidecode设置基本属性
+     setAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
+-- 
+2.33.1
+

deepin-devicemanager.spec

@@ -1,12 +1,13 @@
 Name:           deepin-devicemanager
 Version:        5.6.36
-Release:        2
+Release:        3
 Summary:        Device Manager is a handy tool for viewing hardware information and managing the devices
 License:        GPLv3+
 URL:            https://github.com/linuxdeepin/deepin-devicemanager
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         0001-feat-add-A-help-files.patch
 Patch1:         0002-fix-Ethernet-Controller-X710-disable.patch
+Patch2:         0001-fix-dmidecode17.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake3
@@ -43,6 +44,7 @@ Requires: util-linux
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # help find (and prefer) qt5 utilities, e.g. qmake, lrelease
@@ -74,6 +76,9 @@ systemctl enable deepin-devicemanager-server.service
 /etc/dbus-1/system.d/com.deepin.devicemanager.conf
 
 %changelog
+* Tue Mar 26 2024 liweigang <liweiganga@uniontech.com> - 5.6.36-3
+- fix: Memory units in Device Manager do not match the memory rate units queried by typing dmidecode17 in the terminal
+
 * Tue Nov 28 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.36-2
 - Remove unnecessary macro definitions