packages/dde-file-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 [sync] PR-30: upgrade to version 5.7.8.1

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot 2023-08-23 08:20:28 +00:00 committed by Gitee
commit f973f117dc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 84 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-hide-authorized-watermask.patch
View File

@ -1,27 +1,26 @@
From 03eba42faf61623cc10daf4c3b8da86ee097880c Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Tue, 23 Aug 2022 13:55:54 +0800
From fca58228ea9d31e01dd6e24bee944cebf7df9622 Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Wed, 2 Aug 2023 14:13:35 +0800
Subject: [PATCH] hide authorized watermask
---
src/dde-desktop/view/watermaskframe.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
src/dde-desktop/view/watermaskframe.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp
index b4d1e8b..cfce261 100644
index e36d97b..2d0e72a 100644
--- a/src/dde-desktop/view/watermaskframe.cpp
+++ b/src/dde-desktop/view/watermaskframe.cpp
@@ -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 );
+ //return (DSysInfo::DeepinType::DeepinProfessional == deepinType
+ // || DSysInfo::DeepinType::DeepinPersonal == deepinType
+ // || DSysInfo::DeepinType::DeepinServer == deepinType );
+ return 0;
@@ -98,7 +98,8 @@ void WaterMaskFrame::stateChanged(int state, int prop)
return;
}
bool WaterMaskFrame::parseJson(QString key)
- bool showSate = showLicenseState();
+ //bool showSate = showLicenseState();
+ bool showSate = 0;
bool cn = usingCn();
qInfo() << "reply ActiveState is" << state << prop << "show" << showSate
<< "cn" << cn << this;
--
2.20.1

37
0002-fix-undefined-std-array.patch Normal file
View File

@ -0,0 +1,37 @@
From 340b1be4850c8316ee858f597bcb729363f142b7 Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Thu, 3 Aug 2023 10:15:30 +0800
Subject: [PATCH] fix undefined std::array
---
.../dialogs/private/ddesktoprenamedialog_p.h | 1 +
src/dde-file-manager-lib/views/drenamebar.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
index 80c5c20..f018762 100644
--- a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
+++ b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
@@ -23,6 +23,7 @@
#ifndef DDESKTOPRENAMEDIALOG_P_H
#define DDESKTOPRENAMEDIALOG_P_H
+#include <array>
#include <QString>
#include <QLineEdit>
#include <QLabel>
diff --git a/src/dde-file-manager-lib/views/drenamebar.h b/src/dde-file-manager-lib/views/drenamebar.h
index 45f3b09..b59fa8f 100644
--- a/src/dde-file-manager-lib/views/drenamebar.h
+++ b/src/dde-file-manager-lib/views/drenamebar.h
@@ -26,6 +26,7 @@
#define DRENAMEBAR_H
+#include <array>
#include <QList>
#include <QFrame>
#include <memory>
--
2.20.1

45
dde-file-manager.spec
View File

@ -1,24 +1,20 @@
%define specrelease 1%{?dist}
%if 0%{?openeuler}
%define specrelease 1
%endif
Name: dde-file-manager
Version: 5.2.63
Version: 5.7.8.1
Release: %{specrelease}
Summary: Deepin File Manager
License: GPLv3
URL: https://github.com/linuxdeepin/dde-file-manager
Source0: %{name}_%{version}.tar.gz
Source0: %{name}_%{version}.orig.tar.xz
Patch0: 0001-hide-authorized-watermask.patch
Patch1: 0002-fix-undefined-std-array.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: deepin-gettext-tools
BuildRequires: dde-dock-devel
BuildRequires: file-devel
#BuildRequires: jemalloc-devel
#BuildRequires: cmake(KF5Codecs)
BuildRequires: pkgconfig(atk)
BuildRequires: dtkgui-devel
BuildRequires: pkgconfig(dtkwidget) >= 5.1
@ -52,14 +48,16 @@ BuildRequires: openssl-devel
BuildRequires: libqtxdg-devel
BuildRequires: libmediainfo-devel
BuildRequires: kf5-kcodecs-devel
#BuildRequires: libudisks2-qt5-devel
BuildRequires: lucene++-devel
BuildRequires: htmlcxx-devel
BuildRequires: libgsf-devel
BuildRequires: mimetic-devel
BuildRequires: boost-devel
BuildRequires: deepin-anything-devel deepin-anything-server
BuildRequires: deepin-anything-devel
BuildRequires: deepin-anything-server
BuildRequires: pcre-devel
BuildRequires: docparser-devel
BuildRequires: cryptsetup-devel
# run command by QProcess
#Requires: deepin-shortcut-viewer
@ -69,13 +67,13 @@ Requires: dde-desktop
Requires: jemalloc
Requires: libglvnd-glx
Requires: libdde-file-manager
Requires: deepin-anything-dkms deepin-anything-server
Requires: deepin-anything-dkms
Requires: deepin-anything-server
#Requires: gvfs-client
#Requires: samba
#Requires: xdg-user-dirs
#Requires: gstreamer-plugins-good
Recommends: deepin-manual
Recommends: cryfs
%description
File manager front end of Deepin OS.
@ -117,14 +115,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: dde-dock
Requires: dde-launcher
Requires: dde-session-ui
Requires: tinyxml2
%description -n dde-desktop
Deepin desktop environment - desktop module.
%prep
%setup -q -n %{name}_%{version}
%setup -q
%patch0 -p1
%patch1 -p1
# fix file permissions
find -type f -perm 775 -exec chmod 644 {} \;
@ -162,6 +160,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_sysconfdir}/xdg/autostart/dde-file-manager-autostart.desktop
%endif
%{_bindir}/dde-property-dialog
%{_bindir}/dde-select-dialog-wayland
%{_bindir}/dde-select-dialog-x11
/usr/lib/systemd/system/dde-filemanager-daemon.service
%{_datadir}/applications/dde-open.desktop
@ -169,18 +169,23 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog.service
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_wayland.service
%{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_x11.service
%{_datadir}/dbus-1/services/org.freedesktop.FileManager.service
%{_datadir}/dbus-1/system-services/com.deepin.filemanager.daemon.service
%{_datadir}/polkit-1/actions/com.deepin.filemanager.daemon.policy
%{_datadir}/polkit-1/actions/com.deepin.pkexec.dde-file-manager.policy
%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager
%{_datadir}/applications/context-menus/.readme
%{_libdir}/%{name}/plugins/extensions/.readme
%{_datadir}/%{name}/extensions/appEntry/.readme
%files -n libdde-file-manager
%{_libdir}/dde-file-manager/plugins/previews/libdde-image-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-music-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-pdf-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/previews/libdde-text-preview-plugin.so
%{_libdir}/dde-file-manager/plugins/extensions/libdde-eetrust-emblem-plugin.so
%{_libdir}/libdde-file-manager.so.1.8.2
%{_datadir}/dde-file-manager/mimetypeassociations/mimetypeassociations.json
%{_datadir}/dde-file-manager/mimetypes/archive.mimetype
@ -203,6 +208,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/icons/hicolor/scalable/apps/dde-file-manager.svg
%{_libdir}/libdde-file-manager.so.1
%{_libdir}/libdde-file-manager.so.1.8
%{_libdir}/libdfm-extension.so.1
%{_libdir}/libdfm-extension.so.1.8
%{_libdir}/libdfm-extension.so.1.8.2
%ifarch x86_64
%{_libdir}/deepin-anything-server-lib/plugins/handlers/libdde-anythingmonitor.so
%endif
@ -213,12 +221,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.disk-mount.gschema.xml
%files devel
%{_includedir}/%{name}/*.h
%{_includedir}/%{name}/gvfs/
%{_includedir}/%{name}/%{name}-plugins/
%{_includedir}/%{name}/private/
%{_includedir}/%{name}/
%{_includedir}/dfm-extension/
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/dfm-extension.pc
%{_libdir}/lib%{name}.so
%{_libdir}/libdfm-extension.so
%files -n dde-desktop
%{_bindir}/dde-desktop
@ -230,6 +238,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||:
%{_datadir}/dbus-1/services/com.deepin.dde.desktop.service
%changelog
* Tue Aug 15 2023 leeffo <liweiganga@uniontech.com> - 5.7.8.1-1
- upgrade to version 5.7.8.1
* Wed Mar 29 2023 liweiganga <liweiganga@uniontech.com> - 5.2.63-1
- update: update to 5.2.63

BIN
dde-file-manager_5.2.63.tar.gz → dde-file-manager_5.7.8.1.orig.tar.xz
View File

Binary file not shown.