From c68b64360e75081186d1278e75e7bd9faac368b6 Mon Sep 17 00:00:00 2001
From: yangxianzhao <yangxianzhao@uniontech.com>
Date: Mon, 20 May 2024 14:40:16 +0800
Subject: [PATCH] del backgrond license

---
 0001-del-background-license.patch | 25 +++++++++++++++++++++++++
 0001-fix-obtaining-mem.patch      | 27 +++++++++++++++++++++++++++
 dde-file-manager.spec             |  8 +++++++-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 0001-del-background-license.patch
 create mode 100644 0001-fix-obtaining-mem.patch

diff --git a/0001-del-background-license.patch b/0001-del-background-license.patch
new file mode 100644
index 0000000..0776bd7
--- /dev/null
+++ b/0001-del-background-license.patch
@@ -0,0 +1,25 @@
+From 775e439596286daa73c739093b518c59c2f12db2 Mon Sep 17 00:00:00 2001
+From: yangxianzhao <yangxianzhao@uniontech.com>
+Date: Wed, 13 Mar 2024 11:25:35 +0800
+Subject: [PATCH] del background license
+
+---
+ src/dde-desktop/view/watermaskframe.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp
+index e36d97b..8bc4155 100644
+--- a/src/dde-desktop/view/watermaskframe.cpp
++++ b/src/dde-desktop/view/watermaskframe.cpp
+@@ -98,7 +98,7 @@ void WaterMaskFrame::stateChanged(int state, int prop)
+         return;
+     }
+ 
+-    bool showSate = showLicenseState();
++    bool showSate = 0;
+     bool cn = usingCn();
+     qInfo() << "reply ActiveState is" << state << prop << "show" << showSate
+             << "cn" << cn << this;
+-- 
+2.31.1
+
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 <weidong@uniontech.com>
+Date: Mon, 18 Mar 2024 17:00:51 +0800
+Subject: [PATCH] fix: obtaining mem
+
+Signed-off-by: weidongkl <weidong@uniontech.com>
+---
+ 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<QString, QString> 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<qulonglong>(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 b5d0334..5168347 100644
--- a/dde-file-manager.spec
+++ b/dde-file-manager.spec
@@ -2,7 +2,7 @@
 ## (rpmautospec version 0.3.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 6;
+    release_number = 7;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -24,6 +24,8 @@ Source0:        %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
 Patch0001: 0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch
 # Drop unused pcre.h
 Patch0006: 0001-Drop-unused-pcre.h.patch
+Patch0007: 0001-del-background-license.patch
+Patch0008: 0001-fix-obtaining-mem.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
@@ -203,6 +205,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-open.desktop
 %endif
 
 %changelog
+* Mon May 20 2024 yangxianzhao <yangxianzhao@uniontech.com> - 5.8.3-1.7
+- del background license
+- fix obtaining memory
+
 * Wed Mar 27 2024 liuzhilin <liuzhilin@uniontech.com> - 5.8.3-1.6
 - del smbd service patch
 
-- 
Gitee