File project.diff of Package deepin-file-manager

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision ae558871b549a47ac51f2c4d0af218e3 , Show latest

--- deepin-file-manager-rpmlintrc.orig
+++ deepin-file-manager-rpmlintrc
@@ -1,3 +1,3 @@
-addFilter('suse-dbus-unauthorized-service')
 setBadness('suse-dbus-unauthorized-service', 0)
 setBadness('polkit-unauthorized-privilege', 0)
+setBadness('polkit-untracked-privilege', 0)
--- deepin-file-manager.changes.orig
+++ deepin-file-manager.changes
@@ -1,4 +1,96 @@
 -------------------------------------------------------------------
+Sun Apr 21 15:17:48 UTC 2019 - Hillwood Yang <hillwood@opensuse.org>
+
+- Fix ui bug, set Requires tag for libqt5-dxcbplugin.
+
+-------------------------------------------------------------------
+Thu Apr 18 06:28:06 UTC 2019 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 4.8.0
+  * Fix also prompt the user to set executable bits for ELF files.
+  * Fix crash on create file
+  * Fix stray question mark in string.
+  * Fix dialog: default button and recommend button not same
+  * Merged desktop
+  * Implement clear recent history
+  * Fix can not close wallpaper settings view on click empty area
+  * Fix zero size plain text file is not executable script
+  * Fix the mode switch widget overlaps with other widgets
+  * Fix file search view property dialog is empty
+  * Fix dock mount plugin label content as plain text
+  * Fix potential crash when an optical media is inserted.
+  * Fix optical drive detection
+  * Fix avoid crash when we cannot got device info
+  * Fix Nothing on desktop in multi-screen and copy mode
+  * Fix Desktop: use right-click menu when use window scale ratio, desktop will
+    draw the content misplaced
+  * Mount disk image
+  * Context menu icon visible state now configurable
+  * Fix crash when open systemdisk property
+  * Fix use setPlainText for computer view items
+  * Fix build error if enable DISABLE_ANYTHING
+  * Fix MenuAction::Unknow is no longer the last one
+  * Allowed find parent view mode
+  * Fix user dirs changed to English in other DEs
+  * Fix whel not working on ComputerView
+  * Fix disk property display name not correct
+  * Fix set proper working directory when running executables
+  * Fix UI stuck when searching
+  * Fix locker protect for handle xbel file changed
+  * Use concurrent to handle recent file changed
+  * Fix can't use anything for subdirectory
+  * Fix user share dialog cannot open twice
+  * Fix dde-file-manager: crash at getNodeByIndex
+  * Fix dde-wallpaper: the mode switch widget overlaps with other widgets
+  * Menu plugin can know menu is triggered on desktop
+  * Read ~/.dde_env when run via pkexec
+  * Add backup file type for deepin-clone
+  * Support copy file on preview dialog
+  * Get the search results with segment of quick search
+  * Handle sigterm
+  * The dde-wallpaper: support wallpaper slideshow
+  * etc... Please view CHANGELOG.md to get more changes
+
+-------------------------------------------------------------------
+Wed Jan  9 13:30:18 UTC 2019 - hillwood@opensuse.org
+
+- Update version to 4.7.1.10
+  * Use deepin-anything
+  * Use new api of deepin-dock
+  * Fix bugs
+  * Update features
+
+-------------------------------------------------------------------
+Wed Mar 28 01:28:14 UTC 2018 - hillwood@opensuse.org
+
+- Update version to 4.4.8.3
+  * Fix list all symlink files include broken symlink by QDirIterator
+    with QDir::System
+  * Fix can not restore trash files if target file is exist
+  * Fix can not move the invalid symlink to trash
+  * Fix check dock rect failed
+  * Fix can not close computer property dialog  by CloseAllDialogIndicator
+  * Fix the copy file dialog position is wrong when close
+  * Prohibit file names from beginning or ending with spaces
+
+-------------------------------------------------------------------
+Thu Mar 22 02:08:35 UTC 2018 - hillwood@opensuse.org
+
+- Update version to 4.4.8.2 
+  * Fix bugs
+  * Support preview the content files of dim file
+  * Add "QIODevice *createIODevice()" for DAbstractFileInfo
+  * Direct map filesystem to config file
+  * Use env to debug
+  * Support multi struct parial
+  * Add swicth in dfm-platform to hide root system
+  * Disbale unmount function in platform of x86 pro
+  * Add build parameter BUILD_MINIMUM for live system 
+  * Add copy/cut/paste action in DFileDiloag
+  * Add "monitorFiles" for dbus file dialog manager
+  * Add function "windowFlags" for dbus file dialog
+
+-------------------------------------------------------------------
 Thu Nov 30 14:05:50 UTC 2017 - hillwood@opensuse.org
 
 - Update to 4.4.7
--- deepin-file-manager.spec.orig
+++ deepin-file-manager.spec
@@ -19,10 +19,10 @@
 %define sover 1
 
 Name:           deepin-file-manager
-Version:        4.4.7
+Version:        4.8.0
 Release:        0
 Summary:        Deepin File Manager
-License:        GPL-3.0
+License:        GPL-3.0+
 URL:            https://github.com/linuxdeepin/dde-file-manager
 Source0:        https://github.com/linuxdeepin/dde-file-manager/archive/%{version}/%{_name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
@@ -30,21 +30,28 @@ Group:          Productivity/File utilit
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
 BuildRequires:  deepin-gettext-tools
-BuildRequires:  deepin-dock-devel
 BuildRequires:  file-devel
 BuildRequires:  libQt5Gui-private-headers-devel
 BuildRequires:  libqt5-linguist
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(deepin-anything-server-lib)
+BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5MultimediaWidgets)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(libffmpegthumbnailer)
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(dtkwidget)
+BuildRequires:  pkgconfig(dtkwm)
 BuildRequires:  pkgconfig(dframeworkdbus)
+BuildRequires:  pkgconfig(dde-dock)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gsettings-qt)
 BuildRequires:  pkgconfig(libsecret-1)
@@ -55,16 +62,32 @@ BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(xcb-util)
 BuildRequires:  pkgconfig(xcb-ewmh)
 BuildRequires:  pkgconfig(uchardet)
+BuildRequires:  pkgconfig(jemalloc)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libdmr)
+BuildRequires:  pkgconfig(udisks2)
+BuildRequires:  pkgconfig(udisks2-qt5)
+BuildRequires:  cmake(KF5Codecs)
+%ifarch x86_64
+BuildRequires:  kernel-default
+%else
+BuildRequires:  kernel-default
+BuildRequires:  deepin-anything-kmp-default
+%endif
+BuildRequires:  systemd-rpm-macros
 Requires:       deepin-shortcut-viewer
 Requires:       deepin-terminal
+Requires:       deepin-anything
 Requires:       file-roller
 Requires:       gvfs
 Requires:       samba
 Requires:       xdg-user-dirs
 Requires:       gstreamer-plugins-good
-Recommends:     deepin-manual
+Requires:       glib2-tools
+Requires:       libqt5-dxcbplugin
 BuildRequires:  -post-build-checks
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_ordering}
 
 %description
 Deepin File Manager is a file management tool independently  developed by Deepin
@@ -90,34 +113,50 @@ Header files and libraries for Deepin Fi
 
 %prep
 %setup -q -n %{_name}-%{version}
+
+find -type f -perm 775 -exec chmod 644 {} \;
+sed -i '/target.path/s|$${PREFIX}/lib|$$LIBDIR|' dde-dock-plugins/disk-mount/disk-mount.pro
+# 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|%{_datadir}|%{_libdir}|' dde-sharefiles/appbase.pri
+
 sed -i 's|>no<|>auth_admin<|g' \
 dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \
 dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.policy \
 dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \
 usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy
+
 sed -i 's|lrelease|lrelease-qt5|' %{_name}*/generate_translations.sh \
   usb-device-formatter/generate_translations.sh \
   dde-desktop/translate_generation.sh
-sed -i '/target.path/s|lib|%{_lib}|' dde-dock-plugins/disk-mount/disk-mount.pro \
-  dde-dock-plugins/trash/trash.pro
+  
+sed -i '/target.path/s|lib|%{_lib}|' dde-dock-plugins/disk-mount/disk-mount.pro
+  
 sed -i '/PLUGINDIR/s|view|views|' \
   %{_name}-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro
+  
 sed -i 's|%{_datadir}|%{_libdir}|' dde-sharefiles/appbase.pri
 
 # --as-needed link option
 sed -i '/gtk/s|$| x11|' %{_name}-lib/%{_name}-lib.pro
 
+# ln -s dde-file-manager-lib/interfaces/dfmfilepreview.h \
+#       dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/dfmfilepreview.h
+# ln -s dde-file-manager-lib/interfaces/durl.h \
+#      dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/durl.h
+
 %build
 %qmake5 PREFIX=%{_prefix} \
+        LIBDIR=%{_libdir} \
         QMAKE_LFLAGS= \
-        IS_PLATFORM_FEDORA=YES
+        IS_PLATFORM_OPENSUSE=YES
 make %{?_smp_mflags}
 
 %install
-%qmake5_install
+%qmake5_install 
 
 # Fix permission
-chmod 0755 %{buildroot}%{_bindir}/dde-xdg-user-dirs-update.sh
+chmod +x %{buildroot}%{_bindir}/dde-xdg-user-dirs-update
 
 # Fix values extending the format should start with "X-" rpmlint warnings
 sed -i 's/OnlyShowIn=/X-DEEPIN-OnlyShowIn=/g' \
@@ -126,22 +165,27 @@ sed -i 's/OnlyShowIn=/X-DEEPIN-OnlyShowI
         
 # Remove zero-length files
 rm -rf %{buildroot}%{_datadir}/dde-file-manager/mimetypes/audio.mimetype \
-       %{buildroot}%{_datadir}/dde-file-manager/mimetypes/image.mimetype
+       %{buildroot}%{_datadir}/dde-file-manager/mimetypes/image.mimetype \
+       %{buildroot}%{_datadir}/dde-file-manager/templates/newTxt.txt
        
-%suse_update_desktop_file -r -u %{_name} System FileManager
-%suse_update_desktop_file -r -u dde-computer System FileManager
-%suse_update_desktop_file -r -u dde-trash System FileManager
+install -d %{buildroot}%{_sbindir}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdde-filemanager-daemon
+%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
 %fdupes %{buildroot}
 
-%if 0%{?suse_version} < 1330
+%pre
+%service_add_pre dde-filemanager-daemon.service
+
 %post
-%icon_theme_cache_post
-%desktop_database_post
+%service_add_post dde-filemanager-daemon.service
+
+%preun
+%service_del_preun dde-filemanager-daemon.service
 
 %postun
-%icon_theme_cache_postun
-%desktop_database_postun
-%endif
+%service_del_postun dde-filemanager-daemon.service
 
 %post -n lib%{_name}%{sover} -p /sbin/ldconfig
 %postun -n lib%{_name}%{sover} -p /sbin/ldconfig
@@ -151,19 +195,28 @@ rm -rf %{buildroot}%{_datadir}/dde-file-
 %doc README.md LICENSE CHANGELOG.md
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf
 %config %{_sysconfdir}/xdg/autostart/%{_name}-xdg-autostart.desktop
-%config %{_sysconfdir}/xdg/autostart/%{_name}-dialog-autostart.desktop
+%{_libexecdir}/systemd/system/dde-filemanager-daemon.service
 %{_bindir}/%{_name}
 %{_bindir}/%{_name}-daemon
 %{_bindir}/%{_name}-pkexec
 %{_bindir}/dde-desktop
 %{_bindir}/dde-property-dialog
-%{_bindir}/dde-xdg-user-dirs-update.sh
+%{_bindir}/dde-xdg-user-dirs-update
 %{_bindir}/usb-device-formatter
 %{_bindir}/usb-device-formatter-pkexec
-%{_libdir}/dde-dock/plugins/*.so
+%{_sbindir}/rcdde-filemanager-daemon
+%dir %{_libdir}/deepin-anything-server-lib
+%dir %{_libdir}/deepin-anything-server-lib/plugins/
+%dir %{_libdir}/deepin-anything-server-lib/plugins/handlers
+%{_libdir}/deepin-anything-server-lib/plugins/handlers/*.so
+%dir %{_libdir}/dde-dock
+%dir %{_libdir}/dde-dock/plugins
+%dir %{_libdir}/dde-dock/plugins/system-trays/
+%{_libdir}/dde-dock/plugins/system-trays/libdde-disk-mount-plugin.so
+# %{_libdir}/dde-dock/system-trays
+# %{_libdir}/dde-dock/plugins/*.so
 %{_libdir}/%{_name}/
 %{_datadir}/%{_name}/
-%{_datadir}/dman/%{_name}/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/applications/%{_name}.desktop
 %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml
@@ -192,5 +245,6 @@ rm -rf %{buildroot}%{_datadir}/dde-file-
 %defattr(-,root,root,-)
 %{_datadir}/dde-desktop
 %{_datadir}/usb-device-formatter
+%{_datadir}/dde-disk-mount-plugin
 
 %changelog

Places

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

Places