diff --git a/0001-hide-authorized-watermask.patch b/0001-hide-authorized-watermask.patch index 9568ecc90c9e1f501acaff5576b6b16282059561..0b79ef6623f806e414f46669813a866ca25b4660 100644 --- a/0001-hide-authorized-watermask.patch +++ b/0001-hide-authorized-watermask.patch @@ -1,20 +1,18 @@ -From b791b385720b4ecac58cd0771e32f8606dbe9e3b Mon Sep 17 00:00:00 2001 -From: loong ci -Date: Fri, 5 Aug 2022 09:55:37 +0800 +From 03eba42faf61623cc10daf4c3b8da86ee097880c Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Tue, 23 Aug 2022 13:55:54 +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 +index b4d1e8b..cfce261 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() +@@ -336,9 +336,10 @@ bool WaterMaskFrame::isNeedState() { DSysInfo::DeepinType deepinType = DSysInfo::deepinType(); + qInfo() << "deepinType" << deepinType; - return (DSysInfo::DeepinType::DeepinProfessional == deepinType - || DSysInfo::DeepinType::DeepinPersonal == deepinType - || DSysInfo::DeepinType::DeepinServer == deepinType ); @@ -27,4 +25,3 @@ index 45efe3a..c6bd12e 100644 bool WaterMaskFrame::parseJson(QString key) -- 2.20.1 - diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 53f4ab2ca35fbc40c21fb1cb1e8a638128ae01ff..1bb15529a31beda05805cd2c99ab99fe3b03d669 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,15 +1,15 @@ -%define specrelease 9%{?dist} +%define specrelease 1%{?dist} %if 0%{?openeuler} -%define specrelease 5 +%define specrelease 1 %endif Name: dde-file-manager -Version: 5.2.39 +Version: 5.2.63 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}.tar.gz Patch0: 0001-hide-authorized-watermask.patch BuildRequires: gcc-c++ @@ -124,7 +124,7 @@ Requires: tinyxml2 Deepin desktop environment - desktop module. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}_%{version} %patch0 -p1 # fix file permissions @@ -231,6 +231,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Wed Mar 29 2023 liweiganga - 5.2.63-1 +- update: update to 5.2.63 + * Fri Nov 11 2022 liweiganga - 5.2.39-5 - spec: add BR pcre-devel diff --git a/dde-file-manager_5.2.39.orig.tar.xz b/dde-file-manager_5.2.63.tar.gz similarity index 45% rename from dde-file-manager_5.2.39.orig.tar.xz rename to dde-file-manager_5.2.63.tar.gz index 3abef83be8eb9caa52f42f01b1e64d1865c08757..0fe3cc98a176d6876d2484e10896703d14d2f6e6 100644 Binary files a/dde-file-manager_5.2.39.orig.tar.xz and b/dde-file-manager_5.2.63.tar.gz differ