diff --git a/0001-hide-authorized-watermask.patch b/0001-hide-authorized-watermask.patch new file mode 100644 index 0000000000000000000000000000000000000000..9568ecc90c9e1f501acaff5576b6b16282059561 --- /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 0; + } + + bool WaterMaskFrame::parseJson(QString key) +-- +2.20.1 + diff --git a/dde-file-manager-5.2.0.56.tar.gz b/dde-file-manager-5.2.0.56.tar.gz deleted file mode 100644 index c3d0498e674f139c8f338efcd9026a36ad048eaf..0000000000000000000000000000000000000000 Binary files a/dde-file-manager-5.2.0.56.tar.gz and /dev/null differ diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 5896b72a88903209541684bdbb0626ab7c6ca058..19937120093dd7f43fba54f546d6c421b539a542 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,20 +1,27 @@ +%define specrelease 8%{?dist} +%if 0%{?openeuler} +%define specrelease 4 +%endif + Name: dde-file-manager -Version: 5.2.0.56 -Release: 1 +Version: 5.2.39 +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 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,12 +52,29 @@ 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 + +# run command by QProcess +#Requires: deepin-shortcut-viewer Requires: deepin-terminal Requires: dde-desktop +#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. @@ -71,6 +97,8 @@ Requires: libzen Requires: udisks2-qt5 Requires: taglib Requires: libgio-qt +Requires: deepin-anything-libs + %description -n libdde-file-manager DDE File Manager library. @@ -88,22 +116,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 -%autosetup -c -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 @@ -124,8 +156,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.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 -/lib/systemd/system/dde-filemanager-daemon.service +/usr/lib/systemd/system/dde-filemanager-daemon.service %{_datadir}/applications/dde-open.desktop %{_datadir}/applications/%{name}.desktop @@ -136,6 +172,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.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 @@ -164,15 +202,15 @@ 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 +%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/ @@ -191,6 +229,18 @@ 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 + +* Tue Jul 26 2022 liweiganga - 5.2.39-2 +- modify cryfs Requires to Recommends + +* Mon Jul 18 2022 konglidong - 5.2.39-1 +- update version to 5.2.39 + * Thu Jul 08 2021 weidong - 5.2.0.56-10 - Update 5.2.0.56. diff --git a/dde-file-manager_5.2.39.orig.tar.xz b/dde-file-manager_5.2.39.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3abef83be8eb9caa52f42f01b1e64d1865c08757 Binary files /dev/null and b/dde-file-manager_5.2.39.orig.tar.xz differ