From 9dfad2f532dc608fef1619dcdba1c3eb7d693c02 Mon Sep 17 00:00:00 2001 From: weidongkl Date: Mon, 18 Mar 2024 17:22:23 +0800 Subject: [PATCH] fix obtaining mem Signed-off-by: weidongkl --- 0001-fix-obtaining-mem.patch | 27 +++++++++++++++++++++++++++ dde-file-manager.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-fix-obtaining-mem.patch diff --git a/0001-fix-obtaining-mem.patch b/0001-fix-obtaining-mem.patch new file mode 100644 index 0000000..7bbd7e8 --- /dev/null +++ b/0001-fix-obtaining-mem.patch @@ -0,0 +1,27 @@ +From 121a468a8e5e50fd3a17e825e6e9b35d35ab350f Mon Sep 17 00:00:00 2001 +From: weidongkl +Date: Mon, 18 Mar 2024 17:00:51 +0800 +Subject: [PATCH] fix: obtaining mem + +Signed-off-by: weidongkl +--- + src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp b/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp +index 3a55a3f..38330b4 100644 +--- a/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp ++++ b/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp +@@ -463,6 +463,9 @@ QHash ComputerPropertyDialog::getMessage(const QStringList &da + // 获取安装的内存总量 + if (deepin_systemInfo) + memoryInstallStr = formatCap(deepin_systemInfo->property("MemorySize").toULongLong(), 1024, 0); ++ tempMemory = DSysInfo::memoryTotalSize(); ++ if (tempMemory >= 0) ++ memoryStr = formatCap(static_cast(tempMemory)); + if (m_systemInfo->isValid()) { + //! 获取cpu信息 + processor = m_systemInfo->processor(); +-- +2.20.1 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 4f7315c..d16efe4 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.3 +%define anolis_release .0.4 Name: dde-file-manager Version: 5.7.8.1 Release: 1%{anolis_release}%{?dist} @@ -9,6 +9,7 @@ Source0: %{name}_%{version}.orig.tar.xz Patch1: 0001-del-background-license.patch Patch2: 0001-fix-smdb-service-error.patch +Patch3: 0001-fix-obtaining-mem.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -130,6 +131,7 @@ Deepin desktop environment - desktop module. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 # fix file permissions find -type f -perm 775 -exec chmod 644 {} \; #sed -i '/target.path/s|lib|%{_lib}|' src/dde-dock-plugins/disk-mount/disk-mount.pro @@ -245,6 +247,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Tue Mar 19 2024 weidongkl - 5.7.8.1-1.0.4 +- fix obtaining mem + * Fri Mar 15 2024 liuzhilin - 5.7.8.1-1.0.3 - fix smbd service error -- Gitee