Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-file-manager for
openSUSE:Factory checked in at 2021-06-22 20:44:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-file-manager (Old)
and /work/SRC/openSUSE:Factory/.deepin-file-manager.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-file-manager"
Tue Jun 22 20:44:58 2021 rev:2 rq:901243 version:5.2.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-file-manager/deepin-file-manager.changes
2021-04-26 16:39:33.466069284 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-file-manager.new.2625/deepin-file-manager.changes
2021-06-22 20:45:06.406834178 +0200
@@ -1,0 +2,12 @@
+Mon Jun 7 08:44:34 UTC 2021 - Hillwood Yang <hillw...@opensuse.org>
+
+- Update version to 5.2.18
+ * Fix bugs
+ * Add manual document
+ * Change copyright
+ * Update translations
+- Drop 002-use-Q_GLOBAL_STATIC.patch, merged by upstream
+- Drop disable-dmr.patch, enable dmr for arm
+- Add fix-header-include.patch, dfsearch is necessary
+
+-------------------------------------------------------------------
Old:
----
002-use-Q_GLOBAL_STATIC.patch
dde-file-manager-5.2.0.87.tar.gz
disable-dmr.patch
New:
----
dde-file-manager-5.2.18.tar.gz
fix-header-include.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-file-manager.spec ++++++
--- /var/tmp/diff_new_pack.89np6M/_old 2021-06-22 20:45:07.306835169 +0200
+++ /var/tmp/diff_new_pack.89np6M/_new 2021-06-22 20:45:07.310835173 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-file-manager
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define _name dde-file-manager
%define sover 5
@@ -25,98 +26,96 @@
%endif
Name: deepin-file-manager
-Version: 5.2.0.87
+Version: 5.2.18
Release: 0
Summary: Deepin File Manager
-License: GPL-3.0+
+License: GPL-3.0-or-later AND MIT
+Group: Productivity/File utilities
URL: https://github.com/linuxdeepin/dde-file-manager
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
-%ifarch %arm aarch64
-# PATCH-FIX-UPSTEAM disable-dmr.patch hillw...@opensuse.org - Disable deepin
movie plugin in ARM64
-Patch0: disable-dmr.patch
-%endif
# PATCH-FIX-UPSTEAM fix-expected-token-errors.patch hillw...@opensuse.org -
Fix error for js code
# Patch1: fix-expected-token-errors.patch
# PATCH-FIX-UPSTEAM fix-return-type-error.patch hillw...@opensuse.org - Fix
build error
-Patch2: fix-return-type-error.patch
-# PATCH-FIX-UPSTEAM 001-use-Q_GLOBAL_STATIC.patch hillw...@opensuse.org
-# use Q_GLOBAL_STATIC to initialize `eventHanlder` and `eventFilter`
-# Initialisation of static global object `eventProcessor` requires
`eventHanlder`
-# and `eventFilter` initialised first. But that's not guaranteed by C++
standard
-# and the program may crash. Instead, use Q_GLOBAL_STATIC to initialise the
latter
-# two objects.
-# Patch4: 001-use-Q_GLOBAL_STATIC.patch
-Patch4: 002-use-Q_GLOBAL_STATIC.patch
-Group: Productivity/File utilities
-BuildRequires: fdupes
-BuildRequires: update-desktop-files
+Patch1: fix-return-type-error.patch
+# PATCH-FIX-UPSTEAM fix-header-include.patch hillw...@opensuse.org - dfsearch
is necessary
+Patch2: fix-header-include.patch
+%ifarch ppc ppc64 ppc64le s390 s390x
+BuildRequires: deepin-desktop-base
+%else
+BuildRequires: deepin-manual
+%endif
+BuildRequires: boost-devel
BuildRequires: deepin-gettext-tools
+BuildRequires: dtkcore
+BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: libQt5Gui-private-headers-devel
+BuildRequires: libQt5PlatformHeaders-devel
BuildRequires: libQt5Widgets-private-headers-devel
-BuildRequires: libqt5-linguist
-BuildRequires: libmimetic-devel
-BuildRequires: dtkcore
-BuildRequires: boost-devel
BuildRequires: libboost_system-devel
+BuildRequires: libmimetic-devel
+BuildRequires: libqt5-linguist
+BuildRequires: systemd-rpm-macros
BuildRequires: udisks2-qt5-devel >= 5.0.0
-%ifarch %arm aarch64
-%else
-BuildRequires: pkgconfig(libdmr)
-%endif
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(Qt5Multimedia)
-BuildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5Codecs)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5MultimediaWidgets)
-BuildRequires: pkgconfig(Qt5Svg)
-BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xdg)
-BuildRequires: pkgconfig(libffmpegthumbnailer)
+BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(dde-dock)
+BuildRequires: pkgconfig(dframeworkdbus)
+BuildRequires: pkgconfig(disomaster)
BuildRequires: pkgconfig(dtkwidget)
BuildRequires: pkgconfig(dtkwm)
-BuildRequires: pkgconfig(dframeworkdbus)
-BuildRequires: pkgconfig(dde-dock)
-BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gio-qt)
BuildRequires: pkgconfig(gsettings-qt)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(htmlcxx)
+BuildRequires: pkgconfig(jemalloc)
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(libdmr)
+BuildRequires: pkgconfig(libffmpegthumbnailer)
+BuildRequires: pkgconfig(libgsf-1)
+BuildRequires: pkgconfig(liblucene++)
+BuildRequires: pkgconfig(libmediainfo)
BuildRequires: pkgconfig(libsecret-1)
-BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(polkit-qt5-1)
+BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(taglib)
-BuildRequires: pkgconfig(xcb-util)
-BuildRequires: pkgconfig(xcb-ewmh)
BuildRequires: pkgconfig(uchardet)
-BuildRequires: pkgconfig(jemalloc)
BuildRequires: pkgconfig(udisks2)
-BuildRequires: pkgconfig(disomaster)
-BuildRequires: pkgconfig(gio-qt)
-BuildRequires: pkgconfig(libcrypto)
-BuildRequires: pkgconfig(libmediainfo)
-BuildRequires: pkgconfig(liblucene++)
-BuildRequires: pkgconfig(htmlcxx)
-BuildRequires: pkgconfig(libgsf-1)
-BuildRequires: cmake(KF5Codecs)
-BuildRequires: systemd-rpm-macros
+BuildRequires: pkgconfig(xcb-ewmh)
+BuildRequires: pkgconfig(xcb-util)
+# Workaround the error: 'sleep_for' is not a member of 'std::this_thread'
+%if 0%{?suse_version} > 1500
+BuildRequires: gcc10
+BuildRequires: gcc10-c++
+%endif
Requires: deepin-shortcut-viewer
Requires: deepin-terminal
Requires: file-roller
-Requires: gvfs
-Requires: samba
-Requires: xdg-user-dirs
-Requires: gstreamer-plugins-good
Requires: glib2-tools
+Requires: gstreamer-plugins-good
+Requires: gvfs
Requires: libqt5-dxcbplugin
Requires: libqt5-qdbus
Requires: qt5integration
+Requires: samba
+Requires: xdg-user-dirs
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_ordering}
@@ -141,6 +140,7 @@
%package polkit
Summary: Deepin File polkit profiles
+Group: Productivity/File utilities
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
AutoReqProv: Off
@@ -152,6 +152,7 @@
%package dbus
Summary: Deepin File DBus profiles
+Group: Productivity/File utilities
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
AutoReqProv: Off
@@ -174,50 +175,51 @@
%prep
%autosetup -p1 -n %{_name}-%{version}
-sed -i '/#include <QException>/a #include <QPainterPath>'
dialogs/dfmtaskwidget.cpp
-sed -i '/#include <QTimer>/a #include <QPainterPath>'
dde-file-manager-lib/interfaces/dfmglobal.cpp
-sed -i '/#include <QPainter>/a #include <QPainterPath>' \
-dde-file-manager-lib/interfaces/{dlistitemdelegate,dfmstyleditemdelegate,diconitemdelegate}.cpp
dde-file-manager-lib/dialogs/openwithdialog.cpp
+# sed -i '/#include <QException>/a #include <QPainterPath>'
dialogs/dfmtaskwidget.cpp
+# sed -i '/#include <QTimer>/a #include <QPainterPath>'
dde-file-manager-lib/interfaces/dfmglobal.cpp
+# sed -i '/#include <QPainter>/a #include <QPainterPath>' \
+#
dde-file-manager-lib/interfaces/{dlistitemdelegate,dfmstyleditemdelegate,diconitemdelegate}.cpp
dde-file-manager-lib/dialogs/openwithdialog.cpp
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 '/target.path/s|$${PREFIX}/lib|$$LIBDIR|'
src/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|lrelease|lrelease-qt5|' %{_name}/generate_translations.sh \
-%{_name}-*/generate_translations.sh \
-dde-desktop/translate_generation.sh
-
-sed -i 's|lupdate|lupdate-qt5|' %{_name}*/update_translations.sh \
-dde-desktop/update_translations.sh \
-dde-dock-plugins/disk-mount/update_translations.sh
-
-sed -i '/target.path/s|lib|%{_lib}|' 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 '/PLUGINDIR/s|view|views|' \
-
%{_name}-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro
+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
-sed -i 's|/lib/systemd/system|/usr/lib/systemd/system|g' \
-dde-file-manager-daemon/dde-file-manager-daemon.pro
+sed -i '/target.path/s|lib|%{_lib}|'
src/dde-dock-plugins/disk-mount/disk-mount.pro
-sed -i 's|qdbus|qdbus-qt5|g'
dde-file-manager-lib/tests/dbus/ut_dbussystemInfo_test.cpp
+sed -i 's|qdbus|qdbus-qt5|g'
tests/dde-file-manager-lib/dbus/ut_dbussystemInfo_test.cpp
-sed -i 's|qdbusxml2cpp|qdbusxml2cpp-qt5|g'
dde-file-manager-daemon/dbusservice/help.sh \
-dde-file-manager-daemon/dbusservice/vault.sh
+sed -i 's|qdbusxml2cpp|qdbusxml2cpp-qt5|g'
src/dde-file-manager-daemon/dbusservice/help.sh \
+src/dde-file-manager-daemon/dbusservice/vault.sh
-sed -i 's|qdbuscpp2xml|qdbuscpp2xml-qt5|g'
dde-file-manager-daemon/dbusservice/vault.sh
+sed -i 's|qdbuscpp2xml|qdbuscpp2xml-qt5|g'
src/dde-file-manager-daemon/dbusservice/vault.sh
# --as-needed link option
-sed -i '/gtk/s|$| x11|' %{_name}-lib/%{_name}-lib.pro
+sed -i '/PKGCONFIG +=/s|$| x11|' src/%{_name}-lib/%{_name}-lib.pro
-# sed -i 's/1.8.2/%{version}/g' common/common.pri
+sed -i 's/dframeworkdbus/dframeworkdbus
liblucene++/g;s/-lKF5Codecs/-lKF5Codecs -llucene++/g'
src/dde-file-manager-lib/dde-file-manager-lib.pro
+
+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
%build
-%qmake5 \
+
+qmake-qt5 \
+%if 0%{?suse_version} > 1500
+ QMAKE_CC=/usr/bin/gcc-10 \
+ QMAKE_CXX=/usr/bin/g++-10 \
+%endif
PREFIX=%{_prefix} \
LIBDIR=%{_libdir} \
- QMAKE_LFLAGS= \
CONFIG+="DISABLE_ANYTHING" \
IS_PLATFORM_OPENSUSE=YES \
VERSION=%{version}-%{distribution} \
@@ -227,6 +229,12 @@
%install
%qmake5_install
+rm -rf %{buildroot}%{_datadir}/applications/context-menus/.readme \
+
%{buildroot}%{_datadir}/deepin/dde-file-manager/oem-menuextensions/.readme
+
+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
+
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/deepin-file-dbus-installer
install -m0755 %{SOURCE2} %{buildroot}%{_bindir}/deepin-file-polkit-installer
@@ -263,7 +271,7 @@
%suse_update_desktop_file -r dde-computer System FileManager
%suse_update_desktop_file -r dde-trash System FileManager
-%fdupes %{buildroot}
+%fdupes %{buildroot}%{_datadir}
%pre
%service_add_pre dde-filemanager-daemon.service
@@ -283,7 +291,7 @@
%files
%defattr(-,root,root,-)
%doc README.md CHANGELOG.md
-%license LICENSE
+%license LICENSE LICENSE.MIT
# %config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf
%{_prefix}/lib/systemd/system/dde-filemanager-daemon.service
%{_bindir}/*
@@ -297,6 +305,7 @@
%{_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}/deepin/dde-file-manager
++++++ dde-file-manager-5.2.0.87.tar.gz -> dde-file-manager-5.2.18.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-file-manager/dde-file-manager-5.2.0.87.tar.gz
/work/SRC/openSUSE:Factory/.deepin-file-manager.new.2625/dde-file-manager-5.2.18.tar.gz
differ: char 12, line 1
++++++ fix-header-include.patch ++++++
diff -Nur
dde-file-manager-5.2.18/src/dde-file-manager-lib/dde-file-manager-lib.pro
dde-file-manager-5.2.18-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
--- dde-file-manager-5.2.18/src/dde-file-manager-lib/dde-file-manager-lib.pro
2021-04-27 16:51:31.000000000 +0800
+++
dde-file-manager-5.2.18-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
2021-06-07 16:42:26.611157101 +0800
@@ -91,10 +91,7 @@
include(interfaces/vfs/vfs.pri)
include(interfaces/customization/customization.pri)
include(src.pri)
-
-isEqual(ARCH, sw_64) | isEqual(ARCH, mips64) | isEqual(ARCH, mips32) |
isEqual(ARCH, aarch64){
- include(search/dfsearch.pri)
-}
+include(search/dfsearch.pri)
APPSHAREDIR = $$PREFIX/share/$$TARGET
ICONDIR = $$PREFIX/share/icons/hicolor/scalable/apps
++++++ fix-return-type-error.patch ++++++
--- /var/tmp/diff_new_pack.89np6M/_old 2021-06-22 20:45:07.370835240 +0200
+++ /var/tmp/diff_new_pack.89np6M/_new 2021-06-22 20:45:07.374835244 +0200
@@ -1,6 +1,6 @@
-diff -Nur
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/data_stream.cpp
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/data_stream.cpp
----
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/data_stream.cpp
2020-12-14 16:02:28.000000000 +0800
-+++
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/data_stream.cpp
2021-02-22 20:22:33.655472528 +0800
+diff -Nur dde-file-manager-5.2.18/3rdparty/doctotext/data_stream.cpp
dde-file-manager-5.2.18-new/3rdparty/doctotext/data_stream.cpp
+--- dde-file-manager-5.2.18/3rdparty/doctotext/data_stream.cpp 2021-04-27
16:51:31.000000000 +0800
++++ dde-file-manager-5.2.18-new/3rdparty/doctotext/data_stream.cpp
2021-05-03 16:37:16.743190858 +0800
@@ -262,6 +262,7 @@
if (impl->m_pointer < 1)
return false;
@@ -9,9 +9,9 @@
}
size_t BufferStream::size()
-diff -Nur
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/doctotext_c_api.cpp
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/doctotext_c_api.cpp
----
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/doctotext_c_api.cpp
2020-12-14 16:02:28.000000000 +0800
-+++
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/doctotext_c_api.cpp
2021-02-22 20:27:00.870677678 +0800
+diff -Nur dde-file-manager-5.2.18/3rdparty/doctotext/doctotext_c_api.cpp
dde-file-manager-5.2.18-new/3rdparty/doctotext/doctotext_c_api.cpp
+--- dde-file-manager-5.2.18/3rdparty/doctotext/doctotext_c_api.cpp
2021-04-27 16:51:31.000000000 +0800
++++ dde-file-manager-5.2.18-new/3rdparty/doctotext/doctotext_c_api.cpp
2021-05-03 16:38:05.067016201 +0800
@@ -248,6 +248,7 @@
size_t DOCTOTEXT_CALL
doctotext_exception_error_messages_count(DocToTextException* exception)
{
@@ -20,9 +20,9 @@
}
const char* DOCTOTEXT_CALL
doctotext_exception_get_error_message(DocToTextException* exception, size_t
index_message)
-diff -Nur
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/eml_parser.cpp
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/eml_parser.cpp
----
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/eml_parser.cpp
2020-12-14 16:02:28.000000000 +0800
-+++
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/eml_parser.cpp
2021-02-22 21:01:56.661630708 +0800
+diff -Nur dde-file-manager-5.2.18/3rdparty/doctotext/eml_parser.cpp
dde-file-manager-5.2.18-new/3rdparty/doctotext/eml_parser.cpp
+--- dde-file-manager-5.2.18/3rdparty/doctotext/eml_parser.cpp 2021-04-27
16:51:31.000000000 +0800
++++ dde-file-manager-5.2.18-new/3rdparty/doctotext/eml_parser.cpp
2021-05-03 16:40:04.054586143 +0800
@@ -380,6 +380,7 @@
std::string sender = header.sender().str();
if (!sender.empty())
@@ -31,25 +31,14 @@
}
bool EMLParser::error()
-diff -Nur
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/iwork_parser.cpp
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/iwork_parser.cpp
----
dde-file-manager-5.2.0.87/dde-file-manager-lib/3rdParty/doctotext/iwork_parser.cpp
2020-12-14 16:02:28.000000000 +0800
-+++
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/3rdParty/doctotext/iwork_parser.cpp
2021-02-22 20:36:21.417060883 +0800
+diff -Nur dde-file-manager-5.2.18/3rdparty/doctotext/iwork_parser.cpp
dde-file-manager-5.2.18-new/3rdparty/doctotext/iwork_parser.cpp
+--- dde-file-manager-5.2.18/3rdparty/doctotext/iwork_parser.cpp
2021-04-27 16:51:31.000000000 +0800
++++ dde-file-manager-5.2.18-new/3rdparty/doctotext/iwork_parser.cpp
2021-05-03 16:41:02.362375401 +0800
@@ -898,6 +898,7 @@
m_text_body += (*it)->m_text;
++it;
}
-+ return true;
++ return true;
}
//Functions responsible for parsing xml elements:
-diff -Nur
dde-file-manager-5.2.0.87/dde-file-manager-lib/models/dfmrootfileinfo.cpp
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/models/dfmrootfileinfo.cpp
---- dde-file-manager-5.2.0.87/dde-file-manager-lib/models/dfmrootfileinfo.cpp
2020-12-14 16:02:28.000000000 +0800
-+++
dde-file-manager-5.2.0.87-new/dde-file-manager-lib/models/dfmrootfileinfo.cpp
2021-02-22 21:05:59.700997022 +0800
-@@ -175,6 +175,7 @@
- return false;
- }
- }
-+ return true;
- }
-
- QString DFMRootFileInfo::suffix() const
