diff --git a/0001-hide-authorized-watermask.patch b/0001-hide-authorized-watermask.patch new file mode 100644 index 0000000000000000000000000000000000000000..0b79ef6623f806e414f46669813a866ca25b4660 --- /dev/null +++ b/0001-hide-authorized-watermask.patch @@ -0,0 +1,27 @@ +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 b4d1e8b..cfce261 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; + } + + bool WaterMaskFrame::parseJson(QString key) +-- +2.20.1 diff --git a/dde-file-manager-5.1.2.3.tar.bz2 b/dde-file-manager-5.1.2.3.tar.bz2 deleted file mode 100644 index e01c36cfb42147abce5356a2e2d6ff7a5df9a9f9..0000000000000000000000000000000000000000 Binary files a/dde-file-manager-5.1.2.3.tar.bz2 and /dev/null differ diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 577b2930d2119746f71145b311599e30d620b1c6..a6e75af43ca6aba5f247411732afdd5d8ebdb7b5 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,20 +1,27 @@ +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 1 +%endif + Name: dde-file-manager -Version: 5.1.2.3 -Release: 9 +Version: 5.2.63 +Release: 1 Summary: Deepin File Manager License: GPLv3 URL: https://github.com/linuxdeepin/dde-file-manager -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}_%{version}.tar.gz +Patch0: 0001-hide-authorized-watermask.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: dtkcore-devel BuildRequires: dtkgui-devel -BuildRequires: dtkwidget-devel +BuildRequires: pkgconfig(dtkwidget) >= 5.1 BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gsettings-qt) @@ -32,10 +39,12 @@ BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: pkgconfig(taglib) +#BuildRequires: pkgconfig(uchardet) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: qt5-linguist BuildRequires: jemalloc-devel +#BuildRequires: udisks2-qt5 BuildRequires: udisks2-qt5-devel BuildRequires: disomaster-devel BuildRequires: libgio-qt libgio-qt-devel @@ -43,10 +52,31 @@ 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 +BuildRequires: deepin-anything-server +BuildRequires: pcre-devel + +# run command by QProcess +#Requires: deepin-shortcut-viewer Requires: deepin-terminal Requires: dde-desktop -Requires: file-roller +#Requires: file-roller +Requires: jemalloc +Requires: libglvnd-glx +Requires: libdde-file-manager +Requires: deepin-anything-dkms 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. @@ -61,6 +91,16 @@ Header files and libraries for %{name}. %package -n libdde-file-manager Summary: DDE File Manager library Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: kf5-kcodecs +Requires: jemalloc +Requires: poppler-cpp +Requires: libmediainfo +Requires: libzen +Requires: udisks2-qt5 +Requires: taglib +Requires: libgio-qt +Requires: deepin-anything-libs + %description -n libdde-file-manager DDE File Manager library. @@ -78,21 +118,26 @@ 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 -n %{name}_%{version} +%patch0 -p1 +# fix file permissions find -type f -perm 775 -exec chmod 644 {} \; -sed -i '/deepin-daemon/s|lib|libexec|' dde-zone/mainwindow.h -sed -i 's|lib/gvfs|libexec|' %{name}-lib/gvfs/networkmanager.cpp -sed -i 's|/lib/dde-dock/plugins|/lib64/dde-dock/plugins|' dde-dock-plugins/disk-mount/disk-mount.pro +#sed -i '/target.path/s|lib|%{_lib}|' src/dde-dock-plugins/disk-mount/disk-mount.pro +sed -i '/deepin-daemon/s|lib|libexec|' src/dde-zone/mainwindow.h +sed -i 's|lib/gvfs|libexec|' src/%{name}-lib/gvfs/networkmanager.cpp +#sed -i 's|%{_datadir}|%{_libdir}|' dde-sharefiles/appbase.pri +sed -i 's|/lib/dde-dock/plugins|/lib64/dde-dock/plugins|' src/dde-dock-plugins/disk-mount/disk-mount.pro %build export PATH=%{_qt5_bindir}:$PATH -%qmake_qt5 PREFIX=%{_prefix} QMAKE_CFLAGS_ISYSTEM= CONFIG+="DISABLE_FFMPEG DISABLE_ANYTHING" +%qmake_qt5 PREFIX=%{_prefix} QMAKE_CFLAGS_ISYSTEM= CONFIG+="DISABLE_FFMPEG" DEFINES+="VERSION=%{version}" filemanager.pro %make_build %install @@ -102,6 +147,7 @@ export PATH=%{_qt5_bindir}:$PATH desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/dde-computer.desktop ||: desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: +desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %ldconfig_scriptlets @@ -112,8 +158,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: %{_bindir}/%{name} %{_bindir}/%{name}-daemon %{_bindir}/%{name}-pkexec +%ifnarch x86_64 +%{_bindir}/*.sh +%{_sysconfdir}/xdg/autostart/dde-file-manager-autostart.desktop +%endif %{_bindir}/dde-property-dialog /usr/lib/systemd/system/dde-filemanager-daemon.service + +%{_datadir}/applications/dde-open.desktop %{_datadir}/applications/%{name}.desktop %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml @@ -122,6 +174,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: %{_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 %files -n libdde-file-manager %{_libdir}/dde-file-manager/plugins/previews/libdde-image-preview-plugin.so @@ -137,6 +191,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: %{_datadir}/dde-file-manager/mimetypes/image.mimetype %{_datadir}/dde-file-manager/mimetypes/text.mimetype %{_datadir}/dde-file-manager/mimetypes/video.mimetype +%{_datadir}/dde-file-manager/templates/newDoc.wps +%{_datadir}/dde-file-manager/templates/newExcel.et +%{_datadir}/dde-file-manager/templates/newPowerPoint.dps %{_datadir}/dde-file-manager/templates/newDoc.doc %{_datadir}/dde-file-manager/templates/newExcel.xls %{_datadir}/dde-file-manager/templates/newPowerPoint.ppt @@ -147,15 +204,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: %{_datadir}/icons/hicolor/scalable/apps/dde-file-manager.svg %{_libdir}/libdde-file-manager.so.1 %{_libdir}/libdde-file-manager.so.1.8 +%ifarch x86_64 +%{_libdir}/deepin-anything-server-lib/plugins/handlers/libdde-anythingmonitor.so +%endif %files -n dde-disk-mount-plugin %{_libdir}/dde-dock/plugins/system-trays/libdde-disk-mount-plugin.so %{_datadir}/dde-disk-mount-plugin/translations %{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.disk-mount.gschema.xml - - - %files devel %{_includedir}/%{name}/*.h %{_includedir}/%{name}/gvfs/ @@ -167,16 +224,22 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-trash.desktop ||: %files -n dde-desktop %{_bindir}/dde-desktop %{_datadir}/applications/dde-computer.desktop -%exclude %{_datadir}/applications/dde-open.desktop +%{_datadir}/applications/dde-home.desktop %{_datadir}/applications/dde-trash.desktop %dir %{_datadir}/dde-desktop %{_datadir}/dde-desktop/translations/ %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog +* Tue Nov 21 2023 hanshuang - 5.2.63-1 +- update version + * Tue Sep 8 2020 chenbo pan - 5.1.2.3-9 - fix compile error + * Mon Aug 17 2020 chenbo pan - 5.1.2.3-8 - fix spec name + * Thu Jul 30 2020 openEuler Buildteam - 5.1.2.3-7 - Package init + diff --git a/dde-file-manager_5.2.63.tar.gz b/dde-file-manager_5.2.63.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0fe3cc98a176d6876d2484e10896703d14d2f6e6 Binary files /dev/null and b/dde-file-manager_5.2.63.tar.gz differ diff --git a/image/hot_key.png b/image/hot_key.png deleted file mode 100644 index 1e3c2c12fc79d6fa7f92de18d85fb732bb331713..0000000000000000000000000000000000000000 Binary files a/image/hot_key.png and /dev/null differ diff --git a/image/hot_key_en.png b/image/hot_key_en.png deleted file mode 100644 index 0befd3a2e0cd588888b421e749d3d0773cc58ad8..0000000000000000000000000000000000000000 Binary files a/image/hot_key_en.png and /dev/null differ diff --git a/image/newdo.png b/image/newdo.png deleted file mode 100644 index adea46a9c13413b6e878f668b5062eb45b7160ed..0000000000000000000000000000000000000000 Binary files a/image/newdo.png and /dev/null differ diff --git a/image/newdo_en.png b/image/newdo_en.png deleted file mode 100644 index 94f3ae413cf2924512a4939757e499122651dce9..0000000000000000000000000000000000000000 Binary files a/image/newdo_en.png and /dev/null differ diff --git a/image/rename.png b/image/rename.png deleted file mode 100644 index c63ee57026fc28a6d0f0c72abde4ca34975504ce..0000000000000000000000000000000000000000 Binary files a/image/rename.png and /dev/null differ diff --git a/image/rename_en.png b/image/rename_en.png deleted file mode 100644 index 2089bdd07c91584079b5a236f4ea117184b94b97..0000000000000000000000000000000000000000 Binary files a/image/rename_en.png and /dev/null differ