diff --git a/0001-Drop-unused-pcre.h.patch b/0001-Drop-unused-pcre.h.patch deleted file mode 100644 index d9e64195997036b7a040b7e451cc28d8889926a9..0000000000000000000000000000000000000000 --- a/0001-Drop-unused-pcre.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6466ac381ecb184378f5d4ad0d0e03a913e139a2 Mon Sep 17 00:00:00 2001 -From: Robin Lee -Date: Wed, 5 Oct 2022 12:53:33 +0800 -Subject: [PATCH] Drop unused pcre.h - ---- - 3rdparty/fsearch/database_search.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/3rdparty/fsearch/database_search.c b/3rdparty/fsearch/database_search.c -index 9cc11249c..ba1972383 100644 ---- a/3rdparty/fsearch/database_search.c -+++ b/3rdparty/fsearch/database_search.c -@@ -24,7 +24,6 @@ - #include - #include - #include --#include - #include - - #include "database_search.h" --- -2.37.2 - diff --git a/0001-del-background-license.patch b/0001-del-background-license.patch deleted file mode 100644 index 0776bd741b6dfa9fcae69562a3c4dc8992d5c517..0000000000000000000000000000000000000000 --- a/0001-del-background-license.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 775e439596286daa73c739093b518c59c2f12db2 Mon Sep 17 00:00:00 2001 -From: yangxianzhao -Date: Wed, 13 Mar 2024 11:25:35 +0800 -Subject: [PATCH] del background license - ---- - src/dde-desktop/view/watermaskframe.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp -index e36d97b..8bc4155 100644 ---- a/src/dde-desktop/view/watermaskframe.cpp -+++ b/src/dde-desktop/view/watermaskframe.cpp -@@ -98,7 +98,7 @@ void WaterMaskFrame::stateChanged(int state, int prop) - return; - } - -- bool showSate = showLicenseState(); -+ bool showSate = 0; - bool cn = usingCn(); - qInfo() << "reply ActiveState is" << state << prop << "show" << showSate - << "cn" << cn << this; --- -2.31.1 - diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..114db43c54ab418b1cc0bb842e68506eed85dbfc --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/filemanager/dfmplugin-vault/views/radioframe.cpp b/src/plugins/filemanager/dfmplugin-vault/views/radioframe.cpp +index 76b8389..3c62e83 100644 +--- a/src/plugins/filemanager/dfmplugin-vault/views/radioframe.cpp ++++ b/src/plugins/filemanager/dfmplugin-vault/views/radioframe.cpp +@@ -8,6 +8,7 @@ + #include + + #include ++#include + + using namespace dfmplugin_vault; + DGUI_USE_NAMESPACE diff --git a/0001-fix-del-license-background.patch b/0001-fix-del-license-background.patch deleted file mode 100644 index 0b5ac11ade64f59f3221fa39f4e5f5df0f35060b..0000000000000000000000000000000000000000 --- a/0001-fix-del-license-background.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1195489ee43a517b603c64a6a7c7126d4f0b0aeb Mon Sep 17 00:00:00 2001 -From: liuzhilin -Date: Thu, 29 Feb 2024 15:01:17 +0800 -Subject: [PATCH] fix-del-license-background - ---- - src/dde-desktop/view/watermaskframe.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dde-desktop/view/watermaskframe.cpp b/src/dde-desktop/view/watermaskframe.cpp -index b6e7ac2..d73c112 100644 ---- a/src/dde-desktop/view/watermaskframe.cpp -+++ b/src/dde-desktop/view/watermaskframe.cpp -@@ -81,7 +81,7 @@ void WaterMaskFrame::stateChanged(int state, int prop) - return; - } - -- bool showSate = showLicenseState(); -+ bool showSate = 0; - bool cn = usingCn(); - qInfo() << "reply ActiveState is" << state << prop << "show" << showSate - << "cn" << cn << this; --- -2.39.3 - diff --git a/0001-fix-obtaining-mem.patch b/0001-fix-obtaining-mem.patch deleted file mode 100644 index 7bbd7e8f1585f63c580514974a0b1822d806cfcf..0000000000000000000000000000000000000000 --- a/0001-fix-obtaining-mem.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 121a468a8e5e50fd3a17e825e6e9b35d35ab350f Mon Sep 17 00:00:00 2001 -From: weidongkl -Date: Mon, 18 Mar 2024 17:00:51 +0800 -Subject: [PATCH] fix: obtaining mem - -Signed-off-by: weidongkl ---- - src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp b/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp -index 3a55a3f..38330b4 100644 ---- a/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp -+++ b/src/dde-file-manager-lib/dialogs/computerpropertydialog.cpp -@@ -463,6 +463,9 @@ QHash ComputerPropertyDialog::getMessage(const QStringList &da - // 获取安装的内存总量 - if (deepin_systemInfo) - memoryInstallStr = formatCap(deepin_systemInfo->property("MemorySize").toULongLong(), 1024, 0); -+ tempMemory = DSysInfo::memoryTotalSize(); -+ if (tempMemory >= 0) -+ memoryStr = formatCap(static_cast(tempMemory)); - if (m_systemInfo->isValid()) { - //! 获取cpu信息 - processor = m_systemInfo->processor(); --- -2.20.1 - diff --git a/0001-fix-smb-error.patch b/0001-fix-smb-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..0c53ef7a7c6273ec70d16752fb07cc3492776a3d --- /dev/null +++ b/0001-fix-smb-error.patch @@ -0,0 +1,76 @@ +From f9848fbb0bf54671bcc1c4ac5cb0b2e656cbd488 Mon Sep 17 00:00:00 2001 +From: Hailiang +Date: Tue, 16 Dec 2025 16:00:08 +0800 +Subject: [PATCH] fix smb error + +--- + .../common/dfmplugin-dirshare/utils/usersharehelper.cpp | 2 +- + .../daemon/daemonplugin-sharecontrol/sharecontroldbus.cpp | 6 +++--- + .../dfmplugin-smbbrowser/utils/smbbrowserutils.cpp | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/common/dfmplugin-dirshare/utils/usersharehelper.cpp b/src/plugins/common/dfmplugin-dirshare/utils/usersharehelper.cpp +index 559a140..03aab69 100644 +--- a/src/plugins/common/dfmplugin-dirshare/utils/usersharehelper.cpp ++++ b/src/plugins/common/dfmplugin-dirshare/utils/usersharehelper.cpp +@@ -57,7 +57,7 @@ static constexpr char kGuestOk[] { "guest_ok" }; + + namespace SambaServiceIFace { + static constexpr char kService[] { "org.freedesktop.systemd1" }; +-static constexpr char kPath[] { "/org/freedesktop/systemd1/unit/smbd_2eservice" }; ++static constexpr char kPath[] { "/org/freedesktop/systemd1/unit/smb_2eservice" }; + static constexpr char kInterface[] { "org.freedesktop.systemd1.Unit" }; + + static constexpr char kPropertySubState[] { "SubState" }; +diff --git a/src/plugins/daemon/daemonplugin-sharecontrol/sharecontroldbus.cpp b/src/plugins/daemon/daemonplugin-sharecontrol/sharecontroldbus.cpp +index 7b33322..40374c1 100644 +--- a/src/plugins/daemon/daemonplugin-sharecontrol/sharecontroldbus.cpp ++++ b/src/plugins/daemon/daemonplugin-sharecontrol/sharecontroldbus.cpp +@@ -107,11 +107,11 @@ bool ShareControlDBus::doEnableSmbServices(const QString &serviceName) + } + + QProcess sh; +- sh.start("ln -sf /lib/systemd/system/smbd.service /etc/systemd/system/multi-user.target.wants/smbd.service"); ++ sh.start("ln -sf /lib/systemd/system/smb.service /etc/systemd/system/multi-user.target.wants/smb.service"); + auto ret = sh.waitForFinished(); + fmInfo() << "enable smbd: " << ret; + +- sh.start("ln -sf /lib/systemd/system/nmbd.service /etc/systemd/system/multi-user.target.wants/nmbd.service"); ++ sh.start("ln -sf /lib/systemd/system/nmb.service /etc/systemd/system/multi-user.target.wants/nmb.service"); + ret &= sh.waitForFinished(); + fmInfo() << "enable nmbd: " << ret; + return ret; +@@ -168,7 +168,7 @@ bool ShareControlDBus::doCloseSmbShareByShareName(const QString &name, bool show + } + + QProcess p; +- QStringList params { "smbd", "close-share", name }; ++ QStringList params { "smb", "close-share", name }; + p.start("smbcontrol", params); + bool ret = p.waitForFinished(); + +diff --git a/src/plugins/filemanager/dfmplugin-smbbrowser/utils/smbbrowserutils.cpp b/src/plugins/filemanager/dfmplugin-smbbrowser/utils/smbbrowserutils.cpp +index bee5aa2..8c8117c 100644 +--- a/src/plugins/filemanager/dfmplugin-smbbrowser/utils/smbbrowserutils.cpp ++++ b/src/plugins/filemanager/dfmplugin-smbbrowser/utils/smbbrowserutils.cpp +@@ -84,7 +84,7 @@ bool isServiceRuning(const QString &service) + return false; + + QDBusInterface iface("org.freedesktop.systemd1", +- QString("/org/freedesktop/systemd1/unit/%1d_2eservice").arg(service), ++ QString("/org/freedesktop/systemd1/unit/%1_2eservice").arg(service), + "org.freedesktop.systemd1.Unit", + QDBusConnection::systemBus()); + +@@ -108,7 +108,7 @@ bool startService(const QString &service) + + fmDebug() << QString("activate smbd: construct %1d interface").arg(service); + QDBusInterface iface("org.freedesktop.systemd1", +- QString("/org/freedesktop/systemd1/unit/%1d_2eservice").arg(service), ++ QString("/org/freedesktop/systemd1/unit/%1_2eservice").arg(service), + "org.freedesktop.systemd1.Unit", + QDBusConnection::systemBus()); + fmDebug() << QString("activate smbd: constructed %1d interface").arg(service); +-- +2.43.0 + diff --git a/0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch b/0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch deleted file mode 100644 index dad9a187bb524c7622c82d1b2f1be2590bf21476..0000000000000000000000000000000000000000 --- a/0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 7be53d6b0099d4dfbc99f9c943c3169eae9b9551 Mon Sep 17 00:00:00 2001 -From: Robin Lee -Date: Sat, 21 Nov 2020 17:50:38 +0800 -Subject: [PATCH 1/4] fix: use Q_GLOBAL_STATIC to initialize eventHanlder and - eventFilter - -Initialisation of static global object eventProcessor requires -eventHanlder and eventFilter initialized first. But that's not -guaranteed by C++ standard and the program will crash. Instead, -use Q_GLOBAL_STATIC to initialize the latter two object. - -Log: use Q_GLOBAL_STATIC to initialize eventHanlder and eventFilter -Signed-off-by: Robin Lee ---- - .../interfaces/dfmeventdispatcher.cpp | 20 +++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/dde-file-manager-lib/interfaces/dfmeventdispatcher.cpp b/src/dde-file-manager-lib/interfaces/dfmeventdispatcher.cpp -index b6f62e98a..b2efaa223 100644 ---- a/src/dde-file-manager-lib/interfaces/dfmeventdispatcher.cpp -+++ b/src/dde-file-manager-lib/interfaces/dfmeventdispatcher.cpp -@@ -126,8 +126,8 @@ void DFMEventFuture::operator =(const DFMEventFuture &other) - } - - namespace DFMEventDispatcherData { --static QList eventHandler; --static QList eventFilter; -+Q_GLOBAL_STATIC(QList, eventHandler) -+Q_GLOBAL_STATIC(QList, eventFilter) - - Q_GLOBAL_STATIC(QThreadPool, threadPool) - } -@@ -154,7 +154,7 @@ QVariant DFMEventDispatcher::processEvent(const QSharedPointer &event, - - QVariant result; - -- for (DFMAbstractEventHandler *handler : DFMEventDispatcherData::eventFilter) { -+ for (DFMAbstractEventHandler *handler : *DFMEventDispatcherData::eventFilter) { - if (!handler) - continue; - if (handler->fmEventFilter(event, target, &result)) -@@ -164,7 +164,7 @@ QVariant DFMEventDispatcher::processEvent(const QSharedPointer &event, - if (target) { - target->fmEvent(event, &result); - } else { -- for (DFMAbstractEventHandler *handler : DFMEventDispatcherData::eventHandler) { -+ for (DFMAbstractEventHandler *handler : *DFMEventDispatcherData::eventHandler) { - if (handler->fmEvent(event, &result)) - return result; - } -@@ -197,14 +197,14 @@ QVariant DFMEventDispatcher::processEventWithEventLoop(const QSharedPointercontains(handler)) { -+ DFMEventDispatcherData::eventFilter->append(handler); - } - } - - void DFMEventDispatcher::removeEventFilter(DFMAbstractEventHandler *handler) - { -- DFMEventDispatcherData::eventFilter.removeOne(handler); -+ DFMEventDispatcherData::eventFilter->removeOne(handler); - } - - DFMEventDispatcher::State DFMEventDispatcher::state() const -@@ -222,13 +222,13 @@ DFMEventDispatcher::DFMEventDispatcher() - - void DFMEventDispatcher::installEventHandler(DFMAbstractEventHandler *handler) - { -- if (!DFMEventDispatcherData::eventHandler.contains(handler)) -- DFMEventDispatcherData::eventHandler.append(handler); -+ if (!DFMEventDispatcherData::eventHandler->contains(handler)) -+ DFMEventDispatcherData::eventHandler->append(handler); - } - - void DFMEventDispatcher::removeEventHandler(DFMAbstractEventHandler *handler) - { -- DFMEventDispatcherData::eventHandler.removeOne(handler); -+ DFMEventDispatcherData::eventHandler->removeOne(handler); - } - - DFM_END_NAMESPACE --- -2.34.1 - diff --git a/0001-fix-workspace-correct-icon-view-horizontal-offset-an.patch b/0001-fix-workspace-correct-icon-view-horizontal-offset-an.patch new file mode 100644 index 0000000000000000000000000000000000000000..8e061f1491491dd1ca5b0b0b0d3315f85ebc7ebd --- /dev/null +++ b/0001-fix-workspace-correct-icon-view-horizontal-offset-an.patch @@ -0,0 +1,205 @@ +From 98a60a9c9e5d01e606ea065e02d8c1a56ae6cc59 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 16 Dec 2025 16:26:58 +0800 +Subject: [PATCH] fix(workspace): correct icon view horizontal offset and + refactor calc + +Description: + - Recalculate horizontal offset on view mode change and resize (initHorizontalOffset flag) + - Move offset logic into FileViewPrivate::updateHorizontalOffset() and invoke from FileView::updateHorizontalOffset() + - Use DListView::visualRect() for both list/tree and icon modes; adjust only when needed + - Compute columns via actual item positions to center grid reliably; handle single-row/edge cases + - Add lightweight debug logs during FileViewPrivate init and offset updates + +Log: fix mis-centering in icon view and avoid stale offset after resize/mode changes +Bug: https://pms.uniontech.com/bug-view-273345.html +--- + .../dfmplugin-workspace/views/fileview.cpp | 54 +++++-------------- + .../views/private/fileview_p.cpp | 49 +++++++++++++++++ + .../views/private/fileview_p.h | 2 + + 3 files changed, 63 insertions(+), 42 deletions(-) + +diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/fileview.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/views/fileview.cpp +index c6de130..9eafb47 100644 +--- a/src/plugins/filemanager/core/dfmplugin-workspace/views/fileview.cpp ++++ b/src/plugins/filemanager/core/dfmplugin-workspace/views/fileview.cpp +@@ -148,6 +148,7 @@ void FileView::setViewMode(Global::ViewMode mode) + setItemDelegate(d->delegates[delegateModeIndex]); + switch (d->currentViewMode) { + case Global::ViewMode::kIconMode: ++ d->initHorizontalOffset = false; + setUniformItemSizes(false); + setResizeMode(Adjust); + setOrientation(QListView::LeftToRight, true); +@@ -979,15 +980,7 @@ void FileView::onShowFileSuffixChanged(bool isShow) + + void FileView::updateHorizontalOffset() + { +- if (isIconViewMode()) { +- int contentWidth = maximumViewportSize().width(); +- int itemWidth = itemSizeHint().width() + spacing() * 2; +- int itemColumn = d->iconModeColumnCount(itemWidth); +- +- d->horizontalOffset = -(contentWidth - itemWidth * itemColumn) / 2; +- } else { +- d->horizontalOffset = 0; +- } ++ d->updateHorizontalOffset(); + } + + void FileView::updateView() +@@ -1269,6 +1262,8 @@ bool FileView::edit(const QModelIndex &index, QAbstractItemView::EditTrigger tri + + void FileView::resizeEvent(QResizeEvent *event) + { ++ d->initHorizontalOffset = false; ++ + d->isResizeEvent = true; + DListView::resizeEvent(event); + d->isResizeEvent = false; +@@ -1489,43 +1484,18 @@ QRect FileView::visualRect(const QModelIndex &index) const + if (index.column() != 0) + return rect; + +- QSize itemSize = itemSizeHint(); +- + if (isListViewMode() || isTreeViewMode()) { +- rect.setLeft(kListViewSpacing - horizontalScrollBar()->value()); +- rect.setRight(viewport()->width() - kListViewSpacing - 1); +- rect.setTop(index.row() * (itemSize.height() + kListViewSpacing * 2) + kListViewSpacing); +- rect.setHeight(itemSize.height()); +- +- if (d->allowedAdjustColumnSize && d->headerView) { +- rect.setWidth(d->headerView->length()); +- } ++ rect = DListView::visualRect(index); ++ rect.moveLeft(rect.left() - horizontalScrollBar()->value()); + } else { +- int iconViewSpacing = kIconViewSpacing; +-#ifdef DTKWIDGET_CLASS_DSizeMode +- iconViewSpacing = DSizeModeHelper::element(kCompactIconViewSpacing, kIconViewSpacing); +-#endif +- int itemWidth = itemSize.width() + iconViewSpacing * 2; +- int columnCount = d->iconModeColumnCount(itemWidth); +- +- if (columnCount == 0) +- return rect; +- +- int columnIndex = index.row() % columnCount; +- int rowIndex = index.row() / columnCount; +- +- int iconVerticalTopMargin = 0; +-#ifdef DTKWIDGET_CLASS_DSizeMode +- iconVerticalTopMargin = DSizeModeHelper::element(kCompactIconVerticalTopMargin, kIconVerticalTopMargin); +-#endif +- rect.setTop(rowIndex * (itemSize.height() + 2 * iconViewSpacing) + iconVerticalTopMargin + (rowIndex == 0 ? 1 * iconViewSpacing : 0 * iconViewSpacing)); +- rect.setLeft(columnIndex * itemWidth + (columnIndex == 0 ? iconViewSpacing : 0)); +- rect.setSize(itemSize); ++ rect = DListView::visualRect(index); ++ if (!d->initHorizontalOffset) { ++ d->initHorizontalOffset = true; ++ d->updateHorizontalOffset(); ++ rect = DListView::visualRect(index); ++ } + } + +- rect.moveLeft(rect.left() - horizontalOffset()); +- rect.moveTop(rect.top() - verticalOffset()); +- + return rect; + } + +diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.cpp +index 0aa9a3a..332b675 100644 +--- a/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.cpp ++++ b/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.cpp +@@ -32,6 +32,8 @@ using namespace dfmplugin_workspace; + FileViewPrivate::FileViewPrivate(FileView *qq) + : q(qq) + { ++ fmDebug() << "FileViewPrivate initializing for FileView"; ++ + dragDropHelper = new DragDropHelper(qq); + viewDrawHelper = new ViewDrawHelper(qq); + selectHelper = new SelectHelper(qq); +@@ -43,6 +45,8 @@ FileViewPrivate::FileViewPrivate(FileView *qq) + << FileView::ContiguousSelection; + + allowedAdjustColumnSize = Application::instance()->appAttribute(Application::kViewSizeAdjustable).toBool(); ++ ++ fmDebug() << "FileViewPrivate initialization completed - column size adjustable:" << allowedAdjustColumnSize; + } + + int FileViewPrivate::iconModeColumnCount(int itemWidth) const +@@ -213,3 +217,48 @@ QVariant FileViewPrivate::fileViewStateValue(const QUrl &url, const QString &key + { + return WorkspaceHelper::instance()->getFileViewStateValue(url, key, defalutValue); + } ++ ++void FileViewPrivate::updateHorizontalOffset() ++{ ++ horizontalOffset = 0; ++ if (q->isIconViewMode()) { ++ int contentWidth = q->maximumViewportSize().width(); ++ int itemWidth = q->itemSizeHint().width() + q->spacing() * 2; ++ int itemColumn = 0; ++ if (itemWidth <= 0) { ++ fmDebug() << "Invalid item width, skipping offset calculation"; ++ return; ++ } ++ ++ // 根据qt虚函数去计算当前的itemColumn（每行绘制的个数） ++ int startLeftPx = q->visualRect(q->model()->index(0, 0, q->rootIndex())).left(); ++ int rowCount = q->model()->rowCount(q->rootIndex()); ++ int maxColumnCount = qCeil(contentWidth / (60 + q->spacing() * 2)) + 2; // 60是item最小宽度 ++ ++ for (int i = 1; i < qMax(maxColumnCount, rowCount); i++) { ++ int itemLeft = q->visualRect(q->model()->index(i, 0, q->rootIndex())).left(); ++ // NOTE：如果实际item数量不足以绘制到第二行，qt将不会在位置计算中加上边距， ++ // 会导致新计算出的第二行itemleft比第一行少一个边距的值，所以这里需要用大于等于 ++ if (startLeftPx >= itemLeft) { ++ itemColumn = i; ++ break; ++ } ++ } ++ ++ // 如果itemColumn为0或itemColumn大于等于实际item数量，则说明当前只有一行，则水平偏移量为默认偏移 ++ if (itemColumn <= 0 || itemColumn >= rowCount) { ++ return; ++ } ++ ++ // itemColumn每行绘制的个数，contentWidth绘制区域宽度，itemWidth每一个item + 2倍间距的绘制宽度 ++ if (contentWidth - itemWidth * itemColumn <= 0 ++ || (contentWidth - itemWidth * itemColumn) / 2 >= itemWidth) { ++ initHorizontalOffset = false; ++ fmDebug() << "Resetting to single column layout"; ++ return; ++ } ++ horizontalOffset = -(contentWidth - itemWidth * itemColumn) / 2; ++ } else { ++ horizontalOffset = 0; ++ } ++} +diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.h b/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.h +index 56922de..d6aa238 100644 +--- a/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.h ++++ b/src/plugins/filemanager/core/dfmplugin-workspace/views/private/fileview_p.h +@@ -87,6 +87,7 @@ class FileViewPrivate + + bool itemsExpandable { false }; + std::atomic_bool isShowSmbMountError { false }; ++ bool initHorizontalOffset { false }; + + explicit FileViewPrivate(FileView *qq); + int iconModeColumnCount(int itemWidth = 0) const; +@@ -103,6 +104,7 @@ class FileViewPrivate + + void loadViewMode(const QUrl &url); + QVariant fileViewStateValue(const QUrl &url, const QString &key, const QVariant &defalutValue); ++ void updateHorizontalOffset(); + }; + + } +-- +2.43.0 + diff --git a/9000-adapt-to-server-path.patch b/9000-adapt-to-server-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f40b1ee1d25e81207366ac0c258d0a64e597973 --- /dev/null +++ b/9000-adapt-to-server-path.patch @@ -0,0 +1,25 @@ +From 4e4185c556950599e86a555aa0faf19d9e85b42c Mon Sep 17 00:00:00 2001 +From: kkz +Date: Mon, 28 Oct 2024 18:50:10 +0800 +Subject: [PATCH] adapt to server path + +--- + src/dfm-base/file/local/localfilehandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dfm-base/file/local/localfilehandler.cpp b/src/dfm-base/file/local/localfilehandler.cpp +index b0cf1dc..a68c899 100644 +--- a/src/dfm-base/file/local/localfilehandler.cpp ++++ b/src/dfm-base/file/local/localfilehandler.cpp +@@ -831,7 +831,7 @@ void LocalFileHandlerPrivate::addRecentFile(const QString &filePath, const Deskt + + QString LocalFileHandler::defaultTerminalPath() + { +- const static QString *dde_daemon_default_term = new QString(QStringLiteral("/usr/lib/deepin-daemon/default-terminal")); ++ const static QString *dde_daemon_default_term = new QString(QStringLiteral("/usr/libexec/deepin-daemon/default-terminal")); + const static QString *debian_x_term_emu = new QString(QStringLiteral("/usr/bin/x-terminal-emulator")); + + if (QFileInfo::exists(*dde_daemon_default_term)) { +-- +2.51.0 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 1ebeb413643576acdf9436acf017894901f291d2..490927dcac313639ed65ccec9f3eaa8d62bd9220 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,509 +1,402 @@ -## START: Set by rpmautospec -## (rpmautospec version 0.3.5) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 9; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec - -%global repo dde-file-manager - Name: dde-file-manager -Version: 5.8.3 -Release: %autorelease +Version: 6.0.60.9 +Release: 2%{?dist}.01 Summary: Deepin File Manager -# migrated to SPDX License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/dde-file-manager -Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz - -# fix: use Q_GLOBAL_STATIC to initialize eventHanlder and eventFilter -# Author: Robin Lee -Patch0001: 0001-fix-use-Q_GLOBAL_STATIC-to-initialize-eventHanlder-a.patch -# Drop unused pcre.h -Patch0006: 0001-Drop-unused-pcre.h.patch -Patch0007: 0001-del-background-license.patch -Patch0008: 0001-fix-obtaining-mem.patch +Source0: dde-file-manager_6.0.60.9.orig.tar.xz +Patch9000: 9000-adapt-to-server-path.patch +Patch9001: 0001-fix-build-error.patch +Patch9002: 0001-fix-smb-error.patch +# https://gerrit.uniontech.com/c/dde-file-manager/+/317670 +Patch9003: 0001-fix-workspace-correct-icon-view-horizontal-offset-an.patch BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: deepin-gettext-tools -BuildRequires: dde-dock-devel -BuildRequires: file-devel -BuildRequires: jemalloc-devel -BuildRequires: zlib-devel -BuildRequires: disomaster-devel -BuildRequires: openssl-devel +BuildRequires: cmake +BuildRequires: ninja-build + +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Concurrent) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Xml) +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +# qhelpgenerator-qt5 +BuildRequires: qt5-doctools +# lrelease-qt5 +BuildRequires: qt5-linguist + +BuildRequires: cmake(DtkCore) +BuildRequires: cmake(DtkCMake) +BuildRequires: cmake(DtkWidget) BuildRequires: cmake(KF5Codecs) -BuildRequires: pkgconfig(atk) -BuildRequires: pkgconfig(dtkwidget) >= 2.0.6 -BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 -BuildRequires: udisks2-qt5-devel >= 5.0.3 -BuildRequires: glib2-devel -BuildRequires: libicu-devel -BuildRequires: lucene++-devel -BuildRequires: libxml2-devel -BuildRequires: htmlcxx-devel -BuildRequires: mimetic-devel -BuildRequires: boost-devel -BuildRequires: pkgconfig(libgsf-1) -BuildRequires: pkgconfig(libmediainfo) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(poppler-cpp) + +BuildRequires: pkgconfig(dtkgui) BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(polkit-qt5-1) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) -BuildRequires: qt5-qtbase-private-devel - -BuildRequires: pkgconfig(taglib) -BuildRequires: pkgconfig(uchardet) -BuildRequires: pkgconfig(xcb-util) -BuildRequires: pkgconfig(xcb-ewmh) -BuildRequires: pkgconfig(gio-qt) +BuildRequires: pkgconfig(liblucene++) +BuildRequires: pkgconfig(liblucene++-contrib) BuildRequires: pkgconfig(docparser) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(dfm-io) +BuildRequires: pkgconfig(dfm-mount) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(mount) +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(dfm-burn) +BuildRequires: pkgconfig(dfm-search) +BuildRequires: libicu-devel +BuildRequires: pkgconfig(dde-dock) +BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(deepin-pdfium) BuildRequires: pkgconfig(libcryptsetup) -BuildRequires: qt5-linguist -BuildRequires: systemd -BuildRequires: make +BuildRequires: poppler-cpp-devel +BuildRequires: boost-devel +BuildRequires: doxygen + +BuildRequires: desktop-file-utils + +Requires: dde-common >= 2026 +Requires: libdde-file-manager # run command by QProcess Requires: deepin-shortcut-viewer Requires: deepin-terminal Requires: dde-desktop -Requires: file-roller -Requires: gvfs-client -Requires: samba -Requires: xdg-user-dirs -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +#Requires: file-roller +Requires: jemalloc +Requires: libglvnd-glx +Requires: libdde-file-manager Requires: cryfs +# bugid: 227789 +Requires: dlnfs +%ifarch %{ix86} x86_64 +Requires: deepin-anything-dkms deepin-anything-server +%endif +# bugid: 309185 +Requires: gvfs-smb +Requires: samba +Requires: samba-usershares Recommends: deepin-manual %description File manager front end of Deepin OS. -%package lib -Summary: Shared library for %{name} - -%description lib -This package provides shared library %{name}. - %package devel Summary: Development package for %{name} -Requires: %{name}-lib%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libdfm-io-devel +Requires: libdfm-mount-devel +Requires: libdfm-burn-devel +Requires: libdfm-search-devel %description devel 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 + +%description -n libdde-file-manager +DDE File Manager library. + +%package -n dde-disk-mount-plugin +Summary: plugin of dde-dock +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n dde-disk-mount-plugin +plugin of dde-dock. + %package -n dde-desktop Summary: Deepin desktop environment - desktop module Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dde-dock Requires: dde-launcher Requires: dde-session-ui -Requires: dde-control-center +Requires: libdde-file-manager = %{version}-%{release} %description -n dde-desktop Deepin desktop environment - desktop module. %prep -%autosetup -p1 -n %{repo}-%{version} - -# fix file permissions -find -type f -perm 775 -exec chmod 644 {} \; -sed -i 's|systembusconf.path = /etc/dbus-1/system.d|systembusconf.path = %{_datadir}/dbus-1/system.d|' src/dde-file-manager-daemon/dde-file-manager-daemon.pro -sed -i 's|lib/gvfs|libexec|' src/%{repo}-lib/gvfs/networkmanager.cpp -sed -i 's|systemd_service.path = .*|systemd_service.path = %{_unitdir}|' src/dde-file-manager-daemon/dde-file-manager-daemon.pro +%autosetup -p1 -sed -i '/ENABLE_ANYTHING/d' src/common/common.pri %build export PATH=%{_qt5_bindir}:$PATH -# disable ffmpeg since ffmpegthumbnailer is not available on Fedora -%qmake_qt5 PREFIX=%{_prefix} QMAKE_CFLAGS_ISYSTEM= CONFIG+="DISABLE_FFMPEG" filemanager.pro +sed -i 's/DocParser::convertFile(filePath.toStdString(), maxBytes)/DocParser::convertFile(filePath.toStdString())/' src/services/textindex/utils/docutils.cpp +%cmake -B build -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} -DVERSION=%{version} +cd build %make_build %install +# bugid:286227 +find . -type f -name "p_file-manager.md" | while read file; do + dir=$(dirname "$file") + new_file="${dir}/file-manager.md" + cp "$file" "$new_file" +done +cd build %make_install INSTALL_ROOT=%{buildroot} +# 修复所有 desktop 文件中的 OnlyShowIn 键值（将 DDE 改为 X-DDE） +find %{buildroot}%{_datadir}/applications -name "*.desktop" -exec sed -i 's/OnlyShowIn=Deepin;DDE/OnlyShowIn=Deepin;X-DDE/g' {} \; + +# 可选：如果仍存在其他仅包含 "DDE" 的情况（如 OnlyShowIn=DDE），也可统一处理 +find %{buildroot}%{_datadir}/applications -name "*.desktop" -exec sed -i 's/OnlyShowIn=DDE/OnlyShowIn=X-DDE/g' {} \; + +%post +cp %{_sysconfdir}/X11/Xsession.d/99dfm-dlnfs-automount %{_sysconfdir}/X11/xinit/xinitrc.d/ +df -h | grep boot | awk '{print $1}' | xargs -i blkid {} | awk '{print $2}' | awk -F '=' '{print $2}' |xargs -i echo "ENV{ID_FS_UUID}==\"{}\", ENV{UDISKS_IGNORE}=\"1\"" >> /etc/udev/rules.d/80-udisks-installer.rules + +%postun +rm -rf /etc/udev/rules.d/80-udisks-installer.rules + %check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{repo}.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 -desktop-file-validate %{buildroot}%{_datadir}/applications/dde-open.desktop +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 %files %doc README.md -%license LICENSE.txt -%{_datadir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf -%{_bindir}/%{repo} -%{_bindir}/%{repo}-daemon -%{_bindir}/%{repo}-pkexec -%{_bindir}/dde-property-dialog -%{_bindir}/dde-select-dialog-wayland +%license LICENSE +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.deepin.filemanager.daemon.conf +%{_bindir}/%{name}-daemon +%attr(755,root,root)%{_bindir}/%{name}-pkexec +%{_bindir}/%{name}-server +%attr(755,root,root)%{_bindir}/dde-property-dialog +%{_bindir}/dde-file-dialog %{_bindir}/dde-select-dialog-x11 -%{_prefix}/lib/dde-dock/plugins/ -%{_libdir}/%{repo}/ -%{_datadir}/%{repo}/ -%{_datadir}/deepin/%{repo}/ -%{_datadir}/icons/hicolor/scalable/apps/*.svg -%{_datadir}/applications/%{repo}.desktop +%{_bindir}/dde-select-dialog-wayland +%{_libdir}/%{name}/plugins/filemanager-core/*.so +%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/dde-open.desktop -%{_datadir}/applications/context-menus/ +%{_datadir}/%{name}/translations/*.qm +%{_datadir}/qt5/doc/* +%{_prefix}/lib/systemd/system/dde-filemanager-daemon.service %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialog.xml %{_datadir}/dbus-1/interfaces/com.deepin.filemanager.filedialogmanager.xml %{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog.service %{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_wayland.service %{_datadir}/dbus-1/services/com.deepin.filemanager.filedialog_x11.service -%{_datadir}/dbus-1/services/org.freedesktop.FileManager.service +%{_datadir}/dbus-1/services/org.deepin.filemanager.server.service %{_datadir}/dbus-1/system-services/com.deepin.filemanager.daemon.service -%dir %{_datadir}/dde-disk-mount-plugin -%{_datadir}/dde-disk-mount-plugin/translations/ -%{_unitdir}/dde-filemanager-daemon.service -%{_datadir}/polkit-1/actions/com.deepin.*.policy -%{_datadir}/glib-2.0/schemas/* -%{_datadir}/deepin-manual/ -%{_datadir}/dsg/ -%ifarch aarch64 loongarch64 -%{_bindir}/file-manager.sh -%{_sysconfdir}/xdg/autostart/%{repo}-autostart.desktop -%endif - -%files lib -%{_libdir}/lib%{repo}.so.1* -%{_libdir}/libdfm-extension.so.1* -%license LICENSE.txt +%{_datadir}/deepin-manual/manual-assets/application/dde-file-manager +%{_datadir}/polkit-1/actions/com.deepin.filemanager*.policy +%{_datadir}/polkit-1/actions/com.deepin.pkexec.dde-file-manager.policy +%{_sysconfdir}/X11/Xsession.d/99dfm-dlnfs-automount +%{_sysconfdir}/X11/Xsession.d/99dfm-ulnfs-automount +%{_sysconfdir}/deepin/%{name}/dfm-dlnfs-automount +%{_sysconfdir}/deepin/%{name}/dfm-ulnfs-automount +%{_sysconfdir}/deepin/%{name}/dfm_migrate_filename_from_dlnfs_to_ulnfs +%{_libdir}/%{name}/plugins/common-edge/*.so +%{_libdir}/%{name}/plugins/daemon-edge/*.so +%{_libdir}/%{name}/plugins/filemanager-edge/*.so +%{_libdir}/%{name}/plugins/previews/*.so +%{_datadir}/mime/packages/dtk-dci.xml +%{_libdir}/%{name}/plugins/server-edge/*.so +%attr(755,root,root)%{_bindir}/dfm-open.sh +/usr/lib/systemd/user/dde-file-manager.service +%{_libdir}/libdde-file-manager.so.* +%{_bindir}/dde-file-manager +%{_datadir}/deepin-debug-config/deepin-debug-config.d/org.deepin.file-manager.json +%{_datadir}/deepin-log-viewer/deepin-log.conf.d/dde-file-manager.json +%{_prefix}/lib/systemd/user/deepin-service-plugin@org.deepin.Filemanager.TextIndex.service.d/memory-limit.conf +%{_libdir}/dde-file-manager/plugins/extensions/libdfm-extension-shred.so +%{_libdir}/deepin-service-manager/libdde-filemanager-textindex.so +%{_datadir}/dbus-1/services/org.deepin.Filemanager.TextIndex.service +%{_datadir}/deepin-service-manager/user/dde-filemanager-textindex.json + +%files -n libdde-file-manager +%{_libdir}/libdfm-base.so* +%{_libdir}/libdfm-framework.so* +%{_libdir}/%{name}/plugins/common-core/*.so +%{_libdir}/%{name}/tools/* +%{_datadir}/%{name}/templates/* +%{_datadir}/%{name}/mimetypes/*.mimetype +%{_datadir}/%{name}/mimetypeassociations/*.json +%{_datadir}/glib-2.0/schemas/*.filemanager.gschema.xml +%{_datadir}/deepin/%{name}/oem-menuextensions/.readme +%{_datadir}/applications/context-menus/.readme +%{_datadir}/%{name}/extensions/appEntry/.readme +%{_datadir}/dsg/configs/org.deepin.dde.file-manager/*.json +%{_libdir}//libdfm-extension.so* +%{_libdir}/%{name}/plugins/previews/*.json + +%files -n dde-disk-mount-plugin +%{_prefix}/lib/dde-dock/plugins/system-trays/libdde-disk-mount-plugin.so +%{_datadir}/glib-2.0/schemas/*.disk-mount.gschema.xml %files devel -%{_includedir}/%{repo}/ +%{_includedir}/dfm-base/ +%{_includedir}/dfm-framework/ +%{_libdir}/pkgconfig/dfm-base.pc +%{_libdir}/cmake/dfm-base/*.cmake +%{_libdir}/pkgconfig/dfm-framework.pc +%{_libdir}/cmake/dfm-framework/*.cmake +%{_libdir}/libdfm-base.so +%{_libdir}/libdfm-extension.so +%{_libdir}/libdfm-framework.so %{_includedir}/dfm-extension/ -%{_libdir}/pkgconfig/%{repo}.pc %{_libdir}/pkgconfig/dfm-extension.pc -%{_libdir}/lib%{repo}.so -%{_libdir}/libdfm-extension.so +%{_libdir}/cmake/dfm-extension/*.cmake +%{_libdir}/libdde-file-manager.so %files -n dde-desktop %{_bindir}/dde-desktop +%{_libdir}/%{name}/plugins/desktop-core/*.so +%{_libdir}/%{name}/plugins/desktop-edge/*.so %{_datadir}/applications/dde-computer.desktop -%{_datadir}/applications/dde-trash.desktop %{_datadir}/applications/dde-home.desktop -%dir %{_datadir}/dde-desktop -%{_datadir}/dde-desktop/translations/ +%{_datadir}/applications/dde-trash.desktop %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service -%ifarch aarch64 loongarch64 -%{_bindir}/dde-computer.sh -%{_bindir}/dde-trash.sh -%endif +%{_datadir}/dbus-1/services/org.freedesktop.FileManager.service %changelog -* Thu Dec 18 2025 pangqing - 5.8.3-1.9 -- Add Requires cryfs - -* Fri Jun 20 2025 mgb01105731 - 5.8.3-1.8 -- Rebuild with poppler poppler 25.04.0 - -* Mon May 20 2024 yangxianzhao - 5.8.3-1.7 -- del background license -- fix obtaining memory - -* Wed Mar 27 2024 liuzhilin - 5.8.3-1.6 -- del smbd service patch - -* Fri Mar 15 2024 liuzhilin - 5.8.3-1.5 -- fix smbd service error - -* Thu Feb 29 2024 liuzhilin - 5.8.3-1.4 -- fix del license-background - -* Fri Dec 8 2023 Wenlong Zhang - 5.8.3-1.3 -- fix build error for loongarch64 - -* Tue Nov 07 2023 yangxianzhao - 5.8.3-1.2 -- rebuild for qt - -* Fri Nov 03 2023 yangxianzhao - 5.8.3-1.1 -- update requires - -* Sat Aug 19 2023 Robin Lee - 5.8.3-1 -- New release 5.8.3 - -* Wed Jul 19 2023 Fedora Release Engineering - 5.6.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Feb 11 2023 Robin Lee - 5.6.4-9 -- Fix patch numbering - -* Sat Feb 11 2023 Robin Lee -- Drop unused pcre.h (RHBZ#2128287) - -* Thu Jan 19 2023 Fedora Release Engineering - 5.6.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 18 2023 Florian Weimer - 5.6.4-6 -- C99 compatibility fix - -* Sat Nov 05 2022 Robin Lee - 5.6.4-5 -- Rebuild (qt5) - -* Sat Nov 05 2022 Robin Lee - 5.6.4-4 -- Revert "Re-mark need for rebuild at Qt5 version update" - -* Sat Nov 05 2022 Robin Lee - 5.6.4-3 -- Re-mark need for rebuild at Qt5 version update - -* Thu Jul 21 2022 Fedora Release Engineering - 5.6.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jul 16 2022 Robin Lee - 5.6.4-1 -- New release 5.6.4 - -* Fri Jul 15 2022 Robin Lee - 5.5.10-5 -- BR pcre-devel - -* Thu Jul 14 2022 Jan Grulich - 5.5.10-4 -- Rebuild (qt5) - -* Tue May 17 2022 Jan Grulich - 5.5.10-3 -- Rebuild (qt5) - -* Tue Apr 19 2022 Robin Lee - 5.5.10-2 -- fix Patch0002 to fix build on aarch64 - -* Tue Apr 19 2022 Robin Lee - 5.5.10-1 -- New release 5.5.10 - -* Tue Mar 08 2022 Jan Grulich - 5.5.1-5 -- Rebuild (qt5) - -* Fri Feb 18 2022 Robin Lee - 5.5.1-4 -- Fix build on GCC 12 (RHBZ#2045305) - -* Thu Jan 20 2022 Fedora Release Engineering - 5.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 05 2022 Robin Lee - 5.5.1-2 -- fix Patch0002 to fix build on non-x86 arches - -* Wed Jan 05 2022 Robin Lee - 5.5.1-1 -- New release 5.5.1 - -* Tue Oct 05 2021 Robin Lee - 5.2.24-4 -- drop a patch to fix segfault at exit - -* Tue Oct 05 2021 Robin Lee - 5.2.24-3 -- BR systemd for unitdir macro - -* Tue Sep 14 2021 Sahana Prasad - 5.2.24-2 -- Rebuilt with OpenSSL 3.0.0 - -* Mon Sep 06 2021 Robin Lee - 5.2.24-1 -- New release 5.2.24 - -* Wed Jul 21 2021 Fedora Release Engineering - 5.2.0.87-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Apr 7 2021 Robin Lee - 5.2.0.87-2 -- deepin-desktop requires deepin-control-center - -* Fri Mar 12 2021 Robin Lee - 5.2.0.87-1 -- chore: null (liuyangming) -- fix: 撤销之前对批量打开wps文件的修改 (liuyangming) - -* Tue Jan 26 2021 Fedora Release Engineering - 5.2.0.65-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 26 2020 Robin Lee - 5.2.0.65-1 -- new upstream release: 5.2.0.65 - -* Wed Nov 11 2020 Robin Lee - 5.2.0.59-1 -- new upstream release: 5.2.0.59 - -* Wed Sep 16 2020 Robin Lee - 5.0.0-9 -- Fix build with Qt 5.15 - -* Fri Sep 11 2020 Jan Grulich - 5.0.0-9 -- rebuild (qt5) - -* Mon Jul 27 2020 Fedora Release Engineering - 5.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 8 2020 Robin Lee - 5.0.0-4 -- Fix build with Qt 5.14.2 - -* Mon Apr 06 2020 Rex Dieter - 5.0.0-7 -- rebuild (qt5) - -* Tue Jan 28 2020 Fedora Release Engineering - 5.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Marek Kasik - 5.0.0-5 -- Rebuild for poppler-0.84.0 - -* Mon Dec 09 2019 Jan Grulich - 5.0.0-4 -- rebuild (qt5) - -* Wed Sep 25 2019 Jan Grulich - 5.0.0-3 -- rebuild (qt5) - -* Wed Sep 11 2019 Robin Lee - 5.0.0-2 -- Drop gstreamer-plugins-good unused requirement (BZ#1751104) - -* Sat Aug 10 2019 Robin Lee - 5.0.0-1 -- Release 5.0.0 - -* Wed Jul 24 2019 Fedora Release Engineering - 4.7.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 17 2019 Jan Grulich - 4.7.7-4 -- rebuild (qt5) - -* Mon Jun 10 2019 Robin Lee - 4.7.7-3 -- rebuild (Qt5) - -* Sun Mar 10 2019 Robin Lee - 4.7.7-2 -- rebuild (Qt5) - -* Tue Feb 26 2019 mosquito - 4.7.7-1 -- Update to 4.7.7 - -* Tue Feb 19 2019 mosquito - 4.7.6-1 -- Update to 4.7.6 - -* Thu Jan 31 2019 mosquito - 4.7.5-1 -- Update to 4.7.5 - -* Thu Jan 31 2019 Fedora Release Engineering - 4.7.1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Dec 23 2018 mosquito - 4.7.1.10-1 -- Update to 4.7.1.10 - -* Tue Dec 18 2018 Rex Dieter - 4.7.1.9-2 -- rebuild (Qt5) - -* Thu Dec 13 2018 mosquito - 4.7.1.9-1 -- Update to 4.7.1.9 +* Wed Dec 31 2025 liweigang - 6.0.60.9-2.01 +- feat: remove requires deepin-anything-libs -* Thu Dec 13 2018 Rex Dieter - 4.7.1.4-2 -- rebuild (qt5) +* Tue Dec 30 2025 mahailiang - 6.0.60.9-2 +- fix: add requires gvfs-smb samba samba-usershares(bugid:309185) -* Thu Nov 29 2018 mosquito - 4.7.1.4-1 -- Update to 4.7.1.4 +* Mon Dec 29 2025 liweigang - 6.0.60.9-1.01 +- spec: roll back the del requires and adapt to server path -* Thu Nov 22 2018 mosquito - 4.7.1.1-2 -- Add Req deepin-session-ui, deepin-dock, deepin-launcher +* Tue Dec 16 2025 liweigang - 6.0.60.9-1 +- update: update to version 6.0.60.9 -* Mon Nov 12 2018 mosquito - 4.7.1.1-1 -- Update to 4.7.1.1 +* Fri Nov 07 2025 maqi - 6.0.58.4-1.11 +- fix: correct icon view horizontal offset and refactor calc(bugid:273345) -* Fri Sep 21 2018 Jan Grulich - 4.4.9.1-2 -- rebuild (qt5) +* Mon Aug 25 2025 maqi - 6.0.58.4-1.10 +- spec: update license -* Wed Aug 15 2018 mosquito - 4.4.9.1-1 -- Update to 4.4.9.1 +* Mon Apr 21 2025 zhaoshuang - 6.0.58.4-1.09 +- fix: rework to fix smb error(bugid:309185) -* Thu Jul 12 2018 Fedora Release Engineering - 4.4.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Mon Apr 07 2025 mahailiang - 6.0.58.4-1.08 +- fix: fix smb error(bugid:309185) -* Thu Jun 21 2018 Rex Dieter - 4.4.7-10 -- rebuild (qt5) +* Mon Mar 10 2025 liweigang - 6.0.58.4-1.07 +- fix: enhance sorting logic to handle symbolic links in FileSortWorker(bugid:305395) +- fix: enhance sorting functionality in FileViewModel and FileSortWorker(bugid:305283) +- fix: enhance text encoding detection and conversion in text preview(bugid:305149) -* Sun May 27 2018 Rex Dieter - 4.4.7-9 -- rebuild (qt5) +* Fri Feb 14 2025 lvgenggeng - 6.0.58.4-1.06 +- rebuild: rebuild without gcc_secure -* Fri Mar 23 2018 Marek Kasik - 4.4.7-8 -- Rebuild for poppler-0.63.0 +* Tue Feb 11 2025 liweigang - 6.0.58.4-1.05 +- fix: add help file(bugid:286227) -* Mon Mar 19 2018 mosquito - 4.4.7-7 -- Exclude ppc64le, ppc64, aarch64 +* Wed Nov 27 2024 mahailiang - 6.0.58.4-1.04 +- spec: build on sw_64 mips64el -* Sat Mar 10 2018 mosquito - 4.4.7-6 -- Remove obsoletes statement (BZ#1537223) +* Fri Nov 22 2024 suoyunming - 6.0.58.4-1.03 +- fix: solve trash and computer open failed(bugid:282749) -* Tue Feb 20 2018 Rex Dieter - 4.4.7-5 -- rebuild (qt5) +* Wed Nov 20 2024 suoyunming - 6.0.58.4-1.02 +- fix: Resolve version inconsistency errors(bugid:283345) -* Wed Feb 07 2018 Fedora Release Engineering - 4.4.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Oct 28 2024 zhaoshuang - 6.0.58.4-1.01 +- fix: update to version 6.0.58.4 and adapt to server path(bugid:000000) -* Thu Jan 11 2018 Igor Gnatenko - 4.4.7-3 -- Remove obsolete scriptlets +* Sat Oct 26 2024 liweigang - 6.0.57-1 +- update: update to version 6.0.57 -* Mon Jan 01 2018 Rex Dieter - 4.4.7-2 -- rebuild (qt5) +* Mon Oct 21 2024 liweigang - 6.0.54.22-1 +- update: update to version 6.0.54.22 -* Sat Dec 2 2017 mosquito - 4.4.7-1 -- Update to 4.4.7 +* Wed Oct 16 2024 maqi - 6.0.31-1.11 +- fix: sync patch15~21 to fix bug(bugid:270077) +- fix: sync patch22~24 to fix bug(bugid:270025) +- fix: sync patch25 to fix bug(bugid:273345) +- fix: sync patch26 to fix bug(bugid:270027) +- fix: sync patch27 to fix bug(bugid:272403) -* Mon Nov 27 2017 Rex Dieter - 4.3.2-2 -- rebuild (qt5) +* Mon Aug 26 2024 zhangxianting - 6.0.31-1.10 +- fix: [mount/optical] cannot mount a erased bd-re disc(bugid:268053) -* Fri Oct 27 2017 mosquito - 4.3.4-1 -- Update to 4.3.4 +* Tue Jun 25 2024 liweigang - 6.0.31-1.09 +- fix: fix bug(bugid:259825) +- fix: fix bug(bugid:259823) -* Fri Oct 13 2017 mosquito - 4.3.2-1 -- Update to 4.3.2 -- Remove ffmpeg patch file -- BR: Qt5Concurrent Qt5DBus Qt5Gui +* Mon Jun 17 2024 liweigang - 6.0.31-1.08 +- fix: use abspath when using it for the first(bugid:258019) -* Wed Oct 11 2017 Rex Dieter - 4.2.5-2 -- BR: qt5-qtbase-private-devel +* Fri Jun 07 2024 liweigang - 6.0.31-1.07 +- fix: disable qWarning qDebug(bugid:258019) -* Sat Aug 26 2017 mosquito - 4.2.5-1 -- Update to 4.2.5 +* Fri Feb 23 2024 haomimi - 6.0.31-1.06 +- fix: copy cut error in NTFS format USB (bugid:235155) -* Mon Aug 21 2017 mosquito - 4.2.4-1 -- Update to 4.2.4 +* Fri Dec 22 2023 liuzhilin - 6.0.31-1.05 +- fix: property-dialog-Show-property-dialog-crash-in-server(bugid:228681) -* Sun Aug 20 2017 mosquito - 4.2.3-1 -- Update to 4.2.3 +* Tue Dec 19 2023 hanshuang - 6.0.31-1.04 +- fix: remove dde-file-manager show partitions boot (bugid:188107) -* Tue Aug 1 2017 mosquito - 4.2.2-1 -- Update to 4.2.2 +* Fri Dec 01 2023 maqi - 6.0.31-1.03 +- fix: change the position of 99dfm-dlnfs-automount for automatic loading(bugid:227789) -* Fri Jul 14 2017 mosquito - 4.1.8-1.git9308953 -- Update to 4.1.8 +* Tue Nov 07 2023 liuzhilin - 6.0.31-1.01 +- fix: fix dde-property-dialog permission(bugid:226865) -* Fri May 19 2017 mosquito - 4.1.5-1.git99d7597 -- Update to 4.1.5 +* Mon Oct 09 2023 liweigang - 6.0.31-1 +- update: update to version 6.0.31 -* Tue Mar 7 2017 mosquito - 1.4.1-1.gite303113 -- Update to 1.4.1 +* Wed Jun 14 2023 liweigang - 5.7.8.1-2 +- rebuild: rebuild -* Sat Jan 28 2017 mosquito - 1.3.8-1.git207000d -- Update to 1.3.8 +* Mon Apr 17 2023 liweigang - 5.7.8.1-1 +- update: update to 5.7.8.1(support GB18030) -* Sun Jan 22 2017 mosquito - 1.3.7-2.gitf1915f8 -- Add Req for run command +* Mon Mar 13 2023 yuxiaojun - 5.7.6-4 +- feat: show not permitted translate to chinese -* Tue Jan 17 2017 mosquito - 1.3.7-1.gitf1915f8 -- Update to 1.3.7 +* Thu Mar 02 2023 yuxiaojun - 5.7.6-3 +- feat: [mount] show not permitted in some mount cases. -* Thu Jan 12 2017 Jaroslav Stepanek 1.3.6-3 -- Fixed broken icon link noticed by Brenton Horne +* Thu Mar 02 2023 liweigang - 5.7.6-2 +- feat: fix sort error(bug:188315) -* Fri Jan 06 2017 Jaroslav Stepanek 1.3.6-2 -- Fixed build dependecies +* Wed Mar 1 2023 tianying - 5.7.6-1.03 +- update: update version only -* Fri Dec 30 2016 Jaroslav Stepanek 1.3.6-1 -- Update package to 1.3.6 and rename to deepin-file-manager +* Fri Feb 10 2023 tianying - 5.7.6-1.02 +- fix: fallback version -* Mon Dec 19 2016 Jaroslav Stepanek 1.3.4-1 -- Update package to 1.3.4 +* Thu Feb 9 2023 tianying - 5.7.6-1.01 +- fix: fix the spelling problem of the audit interface -* Mon Oct 10 2016 Jaroslav Stepanek 1.3.3-1 -- Update package to 1.3.3 +* Tue Jan 10 2023 liweigang - 5.7.6-1 +- update: update to 5.7.6 -* Mon Oct 10 2016 Jaroslav Stepanek 1.2.3-1 -- Initial package build +* Fri Jun 10 2022 liweigang - 5.2.63-8.01 +- build: supprt ppc64le and loongarch64 +* Fri Jun 10 2022 uoser - 5.2.63-8 +- package init diff --git a/dde-file-manager-5.8.3.tar.gz b/dde-file-manager_6.0.60.9.orig.tar.xz similarity index 60% rename from dde-file-manager-5.8.3.tar.gz rename to dde-file-manager_6.0.60.9.orig.tar.xz index d7eb14ad66c43ad2cecc24952048e0375211ea83..e80c1fec1f1e19dac78064bfd36158b7667b0b05 100644 Binary files a/dde-file-manager-5.8.3.tar.gz and b/dde-file-manager_6.0.60.9.orig.tar.xz differ