From 7c5aa44bc1cd44b3dff316ed99bb2314bd462abe Mon Sep 17 00:00:00 2001 From: XingWei-Liu Date: Tue, 18 Jan 2022 11:10:28 +0800 Subject: [PATCH] remove desktop logo for anolisos --- 0002-remove-logo-for-anolis.patch | 27 +++++++++++++++++++++++++++ dde-file-manager.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0002-remove-logo-for-anolis.patch diff --git a/0002-remove-logo-for-anolis.patch b/0002-remove-logo-for-anolis.patch new file mode 100644 index 0000000..6f1bf8e --- /dev/null +++ b/0002-remove-logo-for-anolis.patch @@ -0,0 +1,27 @@ +From e4f13ecc0af934dbab64228f57c2340a25f77e6c Mon Sep 17 00:00:00 2001 +From: xingwei-liu +Date: Tue, 18 Jan 2022 10:24:53 +0800 +Subject: [PATCH] file-manager-remove-logo + +--- + src/dde-desktop/view/watermaskframe.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp +index c0c70c0..d766e92 100644 +--- a/src/dde-desktop/view/watermaskframe.cpp ++++ b/src/dde-desktop/view/watermaskframe.cpp +@@ -108,7 +108,9 @@ void WaterMaskFrame::loadConfig(const QString &fileName) + QJsonDocument doc = QJsonDocument::fromJson(file.readAll(), &error); + if (error.error == QJsonParseError::NoError) { + m_configs = QJsonObject::fromVariantMap(doc.toVariant().toMap()); +- initUI(); ++ if(! (DSysInfo::uosEditionType() == DSysInfo::UosEnterpriseC)){ ++ initUI(); ++ } + } else { + qCritical() << error.errorString(); + } +-- +2.27.0 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 1f0ef71..aea7804 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,4 +1,4 @@ -%global anolis_release .0.1 +%global anolis_release .0.2 Name: dde-file-manager Version: 5.2.51 @@ -9,6 +9,7 @@ URL: https://github.com/linuxdeepin/dde-file-manager Source0: %{name}-%{version}.tar.gz Patch1000: 0001-add-help-manual-for-anolisos.patch +Patch1001: 0002-remove-logo-for-anolis.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -121,6 +122,7 @@ Deepin desktop environment - desktop module. %setup -q -n %{name}-%{version} %patch1000 -p1 +%patch1001 -p1 # fix file permissions find -type f -perm 775 -exec chmod 644 {} \; @@ -226,6 +228,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Thu Jan 18 2022 liuxingwei - 5.2.51.0.2 +- remove desktop logo for anolisos + * Sat Nov 13 2021 huzhengming - 5.2.51 - add help manual for anolisos - update to 5.2.51 -- Gitee