commit: 34ae246216b53543b8bf7ca1e8255275f00736e1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 19 15:41:37 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 19 15:41:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ae2462
kde-frameworks/kio/files: Drop obsolete patches Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...-filewidgets-update-filename-after-rename.patch | 76 ---------------------- .../kio-5.95.0-fix-recent-files-in-gtk-apps.patch | 25 ------- 2 files changed, 101 deletions(-) diff --git a/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch deleted file mode 100644 index 5cf7b9f2fb45..000000000000 --- a/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 6d47b5869d4b328614e5e95e97ef66d97009295e Mon Sep 17 00:00:00 2001 -From: Fushan Wen <[email protected]> -Date: Wed, 15 Jun 2022 22:03:27 +0800 -Subject: [PATCH] filewidgets: update location text after selected files are - renamed - -Before this commit, the location text is not updated after the selected -files are renamed. - -BUG: 455327 ---- - src/filewidgets/kdiroperator.cpp | 3 ++- - src/filewidgets/kdiroperator.h | 9 +++++++++ - src/filewidgets/kfilewidget.cpp | 4 ++++ - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp -index c7a1c9350..adacfda60 100644 ---- a/src/filewidgets/kdiroperator.cpp -+++ b/src/filewidgets/kdiroperator.cpp -@@ -889,8 +889,9 @@ void KDirOperator::renameSelected() - } - - KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this); -- connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this]() { -+ connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this](const QList<QUrl> &urls) { - d->assureVisibleSelection(); -+ Q_EMIT renamingFinished(urls); - }); - - dialog->open(); -diff --git a/src/filewidgets/kdiroperator.h b/src/filewidgets/kdiroperator.h -index cb9668fb7..a15e90765 100644 ---- a/src/filewidgets/kdiroperator.h -+++ b/src/filewidgets/kdiroperator.h -@@ -824,6 +824,7 @@ public Q_SLOTS: - /** - * Initiates a rename operation on the currently selected files/directories, - * prompting the user to choose a new name(s) for the currently selected items -+ * @see renamingFinished - * @since 5.67 - */ - void renameSelected(); -@@ -991,6 +992,14 @@ Q_SIGNALS: - */ - void keyEnterReturnPressed(); - -+ /** -+ * Emitted when renaming selected files has finished. -+ * -+ * @param urls URL list of the renamed files -+ * @since 5.96 -+ */ -+ void renamingFinished(const QList<QUrl> &urls); -+ - private: - friend class KDirOperatorPrivate; - std::unique_ptr<KDirOperatorPrivate> d; -diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp -index 943c0cd93..d0825dfaa 100644 ---- a/src/filewidgets/kfilewidget.cpp -+++ b/src/filewidgets/kfilewidget.cpp -@@ -1185,6 +1185,10 @@ void KFileWidgetPrivate::initDirOpWidgets() - q->connect(m_ops, &KDirOperator::keyEnterReturnPressed, q, [this]() { - slotViewKeyEnterReturnPressed(); - }); -+ q->connect(m_ops, &KDirOperator::renamingFinished, q, [this](const QList<QUrl> &urls) { -+ // Update file names in location text field after renaming selected files -+ q->setSelectedUrls(urls); -+ }); - - m_ops->dirLister()->setAutoErrorHandlingEnabled(false); - q->connect(m_ops->dirLister(), &KDirLister::jobError, q, [this](KIO::Job *job) { --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch deleted file mode 100644 index 524fdc871fc8..000000000000 --- a/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0dd0e96c10f634974c63f85c2068e44019c27591 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <[email protected]> -Date: Wed, 29 Jun 2022 10:14:50 +0200 -Subject: [PATCH] KRecentDocuments: Improve indentation in recentlyused.xbel - -BUG: 456046 ---- - src/core/krecentdocument.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/krecentdocument.cpp b/src/core/krecentdocument.cpp -index 23fcbbd09..87d276b06 100644 ---- a/src/core/krecentdocument.cpp -+++ b/src/core/krecentdocument.cpp -@@ -270,6 +270,7 @@ static bool addToXbel(const QUrl &url, const QString &desktopEntryName, KRecentD - - if (!foundExisting) { - // must create new bookmark tag -+ output.writeCharacters(QStringLiteral(" ")); - output.writeStartElement(bookmarkTag); - - output.writeAttribute(hrefAttribute, newUrl); --- -GitLab -
