!20 [sync] PR-19: 删除桌面授权字样

From: @openeuler-sync-bot 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-08-08 05:04:09 +00:00 committed by Gitee
commit 548f697f62
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,30 @@
From b791b385720b4ecac58cd0771e32f8606dbe9e3b Mon Sep 17 00:00:00 2001
From: loong ci <loong_c@yeah.net>
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

View File

@ -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 <liweiganga@uniontech.com> - 5.2.39-4
- delete authorized watermask
* Tue Aug 02 2022 liweiganga <liweiganga@uniontech.com> - 5.2.39-3
- add requires