From da4f0c1516b0ddf93c87b319ec61060a616d4afd Mon Sep 17 00:00:00 2001 From: loong_C Date: Fri, 5 Aug 2022 11:24:28 +0800 Subject: [PATCH] hide authorized watermask (cherry picked from commit 37752176757f7d24f9babe86325ec41f1abd6b90) --- 0001-hide-authorized-watermask.patch | 30 ++++++++++++++++++++++++++++ dde-file-manager.spec | 9 +++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 0001-hide-authorized-watermask.patch diff --git a/0001-hide-authorized-watermask.patch b/0001-hide-authorized-watermask.patch new file mode 100644 index 0000000..6c889e5 --- /dev/null +++ b/0001-hide-authorized-watermask.patch @@ -0,0 +1,30 @@ +From b791b385720b4ecac58cd0771e32f8606dbe9e3b Mon Sep 17 00:00:00 2001 +From: loong ci +Date: Fri, 5 Aug 2022 09:55:37 +0800 +Subject: [PATCH] hide authorized watermask + +--- + src/dde-desktop/view/watermaskframe.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp +index 45efe3a..c6bd12e 100644 +--- a/src/dde-desktop/view/watermaskframe.cpp ++++ b/src/dde-desktop/view/watermaskframe.cpp +@@ -341,9 +341,10 @@ void WaterMaskFrame::initUI() + bool WaterMaskFrame::isNeedState() + { + DSysInfo::DeepinType deepinType = DSysInfo::deepinType(); +- return (DSysInfo::DeepinType::DeepinProfessional == deepinType +- || DSysInfo::DeepinType::DeepinPersonal == deepinType +- || DSysInfo::DeepinType::DeepinServer == deepinType ); ++ //return (DSysInfo::DeepinType::DeepinProfessional == deepinType ++ // || DSysInfo::DeepinType::DeepinPersonal == deepinType ++ // || DSysInfo::DeepinType::DeepinServer == deepinType ); ++ return -1; + } + + bool WaterMaskFrame::parseJson(QString key) +-- +2.20.1 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index b816760..1993712 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,6 +1,6 @@ %define specrelease 8%{?dist} %if 0%{?openeuler} -%define specrelease 3 +%define specrelease 4 %endif Name: dde-file-manager @@ -9,7 +9,8 @@ Release: %{specrelease} Summary: Deepin File Manager License: GPLv3 URL: https://github.com/linuxdeepin/dde-file-manager -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{name}_%{version}.orig.tar.xz +Patch0: 0001-hide-authorized-watermask.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -122,6 +123,7 @@ Deepin desktop environment - desktop module. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 # fix file permissions find -type f -perm 775 -exec chmod 644 {} \; @@ -227,6 +229,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Fri Aug 05 2022 liweiganga - 5.2.39-4 +- delete authorized watermask + * Tue Aug 02 2022 liweiganga - 5.2.39-3 - add requires -- Gitee