File project.diff of Package deepin-file-manager

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package deepin-file-manager (Revision 57361854edb18e4086cae86b0e6cf1da)

Currently displaying revision 57361854edb18e4086cae86b0e6cf1da , Show latest

--- deepin-file-manager.spec.orig
+++ deepin-file-manager.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package deepin-file-manager
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,10 @@
 
 
 %define _name dde-file-manager
-%define sover 5
+%define sover 1
 
 Name:           deepin-file-manager
-Version:        5.6.4
+Version:        6.0.40
 Release:        0
 Summary:        Deepin File Manager
 License:        GPL-3.0-or-later AND MIT
@@ -29,11 +29,16 @@ URL:            https://github.com/linux
 Source0:        https://github.com/linuxdeepin/dde-file-manager/archive/%{version}/%{_name}-%{version}.tar.gz
 Source1:        deepin-file-dbus-installer.in
 Source2:        deepin-file-polkit-installer.in
-# PATCH-FIX-UPSTEAM fix-header-include.patch hillwood@opensuse.org - dfsearch is necessary
-Patch1:         fix-header-include.patch
-# PATCH-FIX-UPSTEAM gcc12.patch hillwood@opensuse.org - fix gcc 12 build
-Patch2:         gcc-12.patch
-Patch3:         harden_dde-filemanager-daemon.service.patch
+Patch0:         harden_dde-filemanager-daemon.service.patch
+# PATCH-FIX-UPSTRAM change-ddc-dbus-interface.patch hillwood@opensuse.org - com.deepin.dde.ControlCenter was rename to org.deepin.dde.ControlCenter1
+Patch1:         change-ddc-dbus-interface.patch
+# PATCH-FIX-UPSTRAM update-taglib-interface.patch hillwood@opensuse.org - fix build on new taglib
+Patch2:         update-taglib-interface.patch
+%ifarch ppc ppc64 ppc64le s390 s390x
+BuildRequires:  deepin-desktop-base
+%else
+BuildRequires:  deepin-manual
+%endif
 %ifarch ppc ppc64 ppc64le s390 s390x
 BuildRequires:  deepin-desktop-base
 %else
@@ -61,26 +66,31 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(Qt5MultimediaWidgets)
 BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
-BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5Xdg)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(dde-dock)
+BuildRequires:  pkgconfig(deepin-pdfium)
+BuildRequires:  pkgconfig(dfm-burn)
+BuildRequires:  pkgconfig(dfm-io)
+BuildRequires:  pkgconfig(dfm-mount)
 BuildRequires:  pkgconfig(dframeworkdbus)
 BuildRequires:  pkgconfig(disomaster)
 BuildRequires:  pkgconfig(docparser)
+BuildRequires:  pkgconfig(dtkbluetooth)
 BuildRequires:  pkgconfig(dtkwidget)
-BuildRequires:  pkgconfig(dtkwm)
 BuildRequires:  pkgconfig(gio-qt)
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(htmlcxx)
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  pkgconfig(libcryptsetup)
 BuildRequires:  pkgconfig(libdmr)
 BuildRequires:  pkgconfig(libffmpegthumbnailer)
 BuildRequires:  pkgconfig(libgsf-1)
@@ -121,19 +131,26 @@ Group:          System/GUI/Other
 %description -n deepin-desktop
 Deepin desktop environment - desktop module.
 
-%package -n lib%{_name}%{sover}
-Summary:        Deepin File Manager libraries
+%package -n libdfm-base%{sover}
+Summary:        Deepin File Manager Base library
 Group:          System/Libraries
 
-%description -n lib%{_name}%{sover}
-This package contains the libraries for deepin-file-manager
+%description -n libdfm-base%{sover}
+This package contains the base library for deepin-file-manager
 
 %package -n libdfm-extension%{sover}
-Summary:        Deepin File Manager libraries
+Summary:        Deepin File Manager Extension library
 Group:          System/Libraries
 
 %description -n libdfm-extension%{sover}
-This package contains the libraries for deepin-file-manager
+This package contains the extension library for deepin-file-manager
+
+%package -n libdfm-framework%{sover}
+Summary:        Deepin File Manager Framework library
+Group:          System/Libraries
+
+%description -n libdfm-framework%{sover}
+This package contains the framework library for deepin-file-manager
 
 %package polkit
 Summary:        Deepin File polkit profiles
@@ -159,79 +176,70 @@ This package provides dbus profiles for
 not adopted by security team. If you need the dbus feature, you should install
 them manually or use deepin-dbus-install package.
 
-%package devel
+%package -n deepin-file-manager-libdfm-base-devel
 Summary:        Development package for Deepin File Manager
 Group:          Development/Libraries/X11
-Requires:       lib%{_name}%{sover} = %{version}
+Requires:       libdfm-base%{sover} = %{version}
 
-%description devel
+%description -n deepin-file-manager-libdfm-base-devel
 Header files and libraries for Deepin File Manager.
 
-%lang_package
-
-%prep
-%autosetup -p1 -n %{_name}-%{version}
-
-find -type f -perm 775 -exec chmod 644 {} \;
-find -type f -name ".readme" -delete -print
-sed -i '/target.path/s|$${PREFIX}/lib|$$LIBDIR|' src/dde-dock-plugins/disk-mount/disk-mount.pro
-
-sed -i 's|lrelease|lrelease-qt5|' src/%{_name}/generate_translations.sh \
-src/%{_name}-*/generate_translations.sh \
-src/dde-desktop/translate_generation.sh
-
-sed -i 's|lupdate|lupdate-qt5|' src/%{_name}*/update_translations.sh \
-src/dde-desktop/update_translations.sh \
-src/dde-dock-plugins/disk-mount/update_translations.sh
+%package -n deepin-file-manager-libdfm-extension-devel
+Summary:        Development package for Deepin File Manager
+Group:          Development/Libraries/X11
+Requires:       libdfm-extension%{sover} = %{version}
 
-sed -i '/target.path/s|lib|%{_lib}|' src/dde-dock-plugins/disk-mount/disk-mount.pro
+%description -n deepin-file-manager-libdfm-extension-devel
+Header files and libraries for Deepin File Manager.
 
-sed -i 's|qdbus|qdbus-qt5|g' tests/dde-file-manager-lib/dbus/ut_dbussystemInfo_test.cpp
+%package -n deepin-file-manager-libdfm-framework-devel
+Summary:        Development package for Deepin File Manager
+Group:          Development/Libraries/X11
+Requires:       libdfm-framework%{sover} = %{version}
 
-sed -i 's|qdbusxml2cpp|qdbusxml2cpp-qt5|g' src/dde-file-manager-daemon/dbusservice/help.sh \
-src/dde-file-manager-daemon/dbusservice/vault.sh
+%description -n deepin-file-manager-libdfm-framework-devel
+Header files and libraries for Deepin File Manager.
 
-sed -i 's|qdbuscpp2xml|qdbuscpp2xml-qt5|g' src/dde-file-manager-daemon/dbusservice/vault.sh
+%lang_package
 
-# --as-needed link option
-sed -i '/PKGCONFIG +=/s|$| x11 liblucene++|' src/%{_name}-lib/%{_name}-lib.pro
+%prep
+%autosetup -p1 -n %{_name}-%{version}
 
-# sed -i 's/dframeworkdbus/dframeworkdbus liblucene++/g;s/-lKF5Codecs/-lKF5Codecs -llucene++/g' src/dde-file-manager-lib/dde-file-manager-lib.pro
+find -type f -perm 775 -exec chmod 644 {} \;
+# find -type f -name ".readme" -delete -print
 
-cp 3rdparty/fsearch/* src/dde-file-manager-lib/search/
-# sed -i 's|fsearch.h|../../../3rdparty/fsearch/fsearch.h|g' src/dde-file-manager-lib/search/dfsearch.h
+sed -i "s/lupdate/lupdate-qt5/g" src/lupdate.sh
+sed -i "s/lrelease/lrelease-qt5/g" src/translate_generation.sh
+sed -i "/install(TARGETS/s|lib|%{_libdir}|g" src/external/dde-dock-plugins/disk-mount/CMakeLists.txt
 
 %build
-
-qmake-qt5 \
-        PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir} \
-        CONFIG+="DISABLE_ANYTHING" \
-        IS_PLATFORM_OPENSUSE=YES \
-        VERSION=%{version} \
-        filemanager.pro
-%make_build
+%cmake -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}\
+       -DSYSTEMD_USER_UNIT_DIR=%{_userunitdir} \
+       -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC"\
+       -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -fPIC"
+%cmake_build
 
 %install
-%qmake5_install
+%cmake_install
 
 chmod -x %{buildroot}%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager/file-manager/common/*.svg \
          %{buildroot}%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager/file-manager/*/*.md
 
+chmod +x %{buildroot}%{_sysconfdir}/deepin/dde-file-manager/dfm-dlnfs-automount \
+         %{buildroot}%{_bindir}/dde-file-manager-pkexec \
+         %{buildroot}%{_bindir}/dde-property-dialog
+
 install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/deepin-file-dbus-installer
 install -m0755 %{SOURCE2} %{buildroot}%{_bindir}/deepin-file-polkit-installer
 
 # Fix values extending the format should start with "X-" rpmlint warnings
-sed -i 's/OnlyShowIn=/X-DEEPIN-OnlyShowIn=/g' \
+sed -i 's/OnlyShowIn=/X-DDE-OnlyShowIn=/g' \
         %{buildroot}%{_datadir}/applications/dde-computer.desktop \
-        %{buildroot}%{_datadir}/applications/dde-trash.desktop
+        %{buildroot}%{_datadir}/applications/dde-trash.desktop \
+        %{buildroot}%{_datadir}/applications/dde-home.desktop
 
-# Remove zero-length files
-rm -rf %{buildroot}%{_datadir}/dde-file-manager/mimetypes/audio.mimetype \
-        %{buildroot}%{_datadir}/dde-file-manager/mimetypes/image.mimetype
-
-# File all dbus service and policy profiles, workaround boo#1134132 and boo#1134131
-mkdir build
+# archive all dbus service and policy profiles, workaround boo#1134132 and boo#1134131
+# mkdir build
 pushd build
 mkdir polkit
 mv %{buildroot}%{_datadir}/polkit-1/actions/* polkit/
@@ -247,14 +255,16 @@ tar -cvf dbus.tar.gz dbus
 install -m 0644 dbus.tar.gz %{buildroot}%{_datadir}/%{_name}/
 popd
 
-install -d %{buildroot}%{_sbindir}
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdde-filemanager-daemon
+#install -d %{buildroot}%{_sbindir}
+#ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdde-filemanager-daemon
 
 chmod -x %{buildroot}%{_datadir}/dbus-1/services/*.service
 %suse_update_desktop_file -r %{_name} System FileManager
 %suse_update_desktop_file -r dde-computer System FileManager
 %suse_update_desktop_file -r dde-trash System FileManager
 
+%find_lang %{_name} --with-qt
+
 %fdupes %{buildroot}%{_datadir}
 
 %pre
@@ -269,65 +279,88 @@ chmod -x %{buildroot}%{_datadir}/dbus-1/
 %postun
 %service_del_postun dde-filemanager-daemon.service
 
-%post -n lib%{_name}%{sover} -p /sbin/ldconfig
-%postun -n lib%{_name}%{sover} -p /sbin/ldconfig
+%post -n libdfm-base%{sover} -p /sbin/ldconfig
+%postun -n libdfm-base%{sover} -p /sbin/ldconfig
 
 %post -n libdfm-extension%{sover} -p /sbin/ldconfig
 %postun -n libdfm-extension%{sover} -p /sbin/ldconfig
 
+%post -n libdfm-framework%{sover} -p /sbin/ldconfig
+%postun -n libdfm-framework%{sover} -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
-%doc README.md CHANGELOG.md
-%license LICENSE LICENSE.MIT
+%doc README.md README.zh_CN.md
+%license LICENSE
 # %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf
+# %{_sysconfdir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf
+%dir %{_sysconfdir}/X11/Xsession.d/
+%config %{_sysconfdir}/X11/Xsession.d/99dfm-dlnfs-automount
+%dir %{_sysconfdir}/deepin
+%dir %{_sysconfdir}/deepin/dde-file-manager
+%config %{_sysconfdir}/deepin/dde-file-manager/dfm-dlnfs-automount
 %{_prefix}/lib/systemd/system/dde-filemanager-daemon.service
 %{_bindir}/*
 %exclude %{_bindir}/dde-desktop
 %exclude %{_bindir}/deepin-file-dbus-installer
 %exclude %{_bindir}/deepin-file-polkit-installer
-%{_sbindir}/rcdde-filemanager-daemon
+#%{_sbindir}/rcdde-filemanager-daemon
+%{_libdir}/%{_name}
 %dir %{_libdir}/dde-dock
 %dir %{_libdir}/dde-dock/plugins
-%dir %{_libdir}/dde-dock/plugins/system-trays/
+%dir %{_libdir}/dde-dock/plugins/system-trays
 %{_libdir}/dde-dock/plugins/system-trays/libdde-disk-mount-plugin.so
-%{_libdir}/%{_name}/
-%{_datadir}/%{_name}/
-%{_datadir}/deepin-manual/manual-assets/application/%{_name}
 %exclude %{_datadir}/%{_name}/*.tar.gz
-%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/dbus-1/interfaces/*.xml
+%dir %{_datadir}/%{_name}
+%{_datadir}/%{_name}/mimetypeassociations
+%{_datadir}/%{_name}/mimetypes
+%{_datadir}/%{_name}/templates
+%{_datadir}/deepin-manual/manual-assets/application/%{_name}
+#%{_datadir}/icons/hicolor/scalable/apps/*.svg
 # %{_datadir}/deepin/dde-file-manager
-%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
-%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml
+#%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
+#%{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml
 %{_datadir}/dbus-1/services/*.service
 # %{_datadir}/dbus-1/system-services/com.deepin.filemanager.daemon.service
 # %{_datadir}/polkit-1/actions/com.deepin.pkexec.dde-file-manager.policy
 # %{_datadir}/polkit-1/actions/com.deepin.filemanager.daemon.policy
 %{_datadir}/applications/dde-*.desktop
+%dir %{_datadir}/applications/context-menus
+%{_datadir}/applications/context-menus/.readme
 %{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/dbus-1/services/com.deepin.dde.desktop.service
-%ifarch aarch64
-%{_sysconfdir}/xdg/autostart/dde-file-manager-autostart.desktop
-%endif
+%dir %{_datadir}/dsg
+%dir %{_datadir}/dsg/configs
+%{_datadir}/dsg/configs/org.deepin.dde.file-manager
+%{_datadir}/mime/packages/dtk-dci.xml
+%dir %{_datadir}/dde-file-manager/extensions
+%dir %{_datadir}/dde-file-manager/extensions/appEntry
+%{_datadir}/dde-file-manager/extensions/appEntry/.readme
+%dir %{_datadir}/deepin/dde-file-manager
+%dir %{_datadir}/deepin/dde-file-manager/oem-menuextensions
+%{_datadir}/deepin/dde-file-manager/oem-menuextensions/.readme
+%{_datadir}/deepin-log-viewer
+%dir %{_datadir}/deepin-debug-config
+%dir %{_datadir}/deepin-debug-config/deepin-debug-config.d
+%{_datadir}/deepin-debug-config/deepin-debug-config.d/org.deepin.file-manager.json
+%{_userunitdir}/dde-filemanager-server.service
+%{_userunitdir}/dde-session-initialized.target.wants
 
 %files -n deepin-desktop
 %defattr(-,root,root,-)
 %{_bindir}/dde-desktop
 
-%files -n lib%{_name}%{sover}
+%files -n libdfm-base%{sover}
 %defattr(-,root,root,-)
-%{_libdir}/lib%{_name}.so.*
+%{_libdir}/libdfm-base.so.*
 
 %files -n libdfm-extension%{sover}
 %defattr(-,root,root,-)
 %{_libdir}/libdfm-extension.so.*
 
-%files devel
+%files -n libdfm-framework%{sover}
 %defattr(-,root,root,-)
-%{_includedir}/%{_name}
-%{_includedir}/dfm-extension
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/lib%{_name}.so
-%{_libdir}/libdfm-extension.so
+%{_libdir}/libdfm-framework.so.*
 
 %files dbus
 %defattr(-,root,root,-)
@@ -339,9 +372,30 @@ chmod -x %{buildroot}%{_datadir}/dbus-1/
 %{_bindir}/deepin-file-polkit-installer
 %{_datadir}/%{_name}/polkit.tar.gz
 
-%files lang
+%files -n deepin-file-manager-libdfm-base-devel
+%defattr(-,root,root,-)
+%{_includedir}/dfm-base
+%{_libdir}/pkgconfig/dfm-base.pc
+%{_libdir}/libdfm-base.so
+%{_libdir}/cmake/dfm-base
+
+%files -n deepin-file-manager-libdfm-extension-devel
+%defattr(-,root,root,-)
+%{_includedir}/dfm-extension
+%{_libdir}/pkgconfig/dfm-extension.pc
+%{_libdir}/libdfm-extension.so
+%{_libdir}/cmake/dfm-extension
+
+%files -n deepin-file-manager-libdfm-framework-devel
+%defattr(-,root,root,-)
+%{_includedir}/dfm-framework
+%{_libdir}/pkgconfig/dfm-framework.pc
+%{_libdir}/libdfm-framework.so
+%{_libdir}/cmake/dfm-framework
+
+%files lang -f %{_name}.lang
 %defattr(-,root,root,-)
-%{_datadir}/dde-desktop
-%{_datadir}/dde-disk-mount-plugin
+%dir %{_datadir}/dde-file-manager/translations
+%{_datadir}/dde-file-manager/translations/%{_name}.qm
 
 %changelog
--- harden_dde-filemanager-daemon.service.patch.orig
+++ harden_dde-filemanager-daemon.service.patch
@@ -1,9 +1,8 @@
-Index: dde-file-manager-5.2.24/src/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service
-===================================================================
---- dde-file-manager-5.2.24.orig/src/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service
-+++ dde-file-manager-5.2.24/src/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service
-@@ -2,6 +2,17 @@
- Description=DDE File Manager Daemon
+diff -Nur dde-file-manager-6.0.40/src/apps/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service dde-file-manager-6.0.40-new/src/apps/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service
+--- dde-file-manager-6.0.40/src/apps/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service	2024-01-18 16:26:49.000000000 +0800
++++ dde-file-manager-6.0.40-new/src/apps/dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service	2024-02-22 21:09:20.654936935 +0800
+@@ -3,6 +3,17 @@
+ After=local-fs.target udisks2.service usec-boot-unlock.service
  
  [Service]
 +# added automatically, for details please see

Places

File project.diff of Package deepin-file-manager (Revision 57361854edb18e4086cae86b0e6cf1da)

Places