gentoo resync : 09.07.2022

4 files changed, 109 insertions, 1 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 30adc72e3dbc..928e1a5ebd4d 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,7 @@
+AUX kio-5.95.0-filewidgets-update-filename-after-rename.patch 2784 BLAKE2B 9efa93c383dad8beaf36725a8a3495f4a7e575ba15e252f184c88faa9232e88b01dd08792935f57e00edd411eb3e8c0486a31bd8909528aae60ba1691097273e SHA512 ede33a5faff950dbdb172c8e2807045a0ee7abd2e7229b9a38e51e0e5d600d9e42b2ed02fd501d022f0f9112ce3ce2ae7f950771a09649dc7ca85f7b84b175bb
+AUX kio-5.95.0-fix-recent-files-in-gtk-apps.patch 846 BLAKE2B 7b8284df73fff1236d4dfc9f23b6593f9b45bce9c2d7cb78c556f5074d2a562995ab86fe8b9dbac46083f14826b14f7d1a2423c539695cf2b66249f7b3a6e095 SHA512 c28d36af0184e4ca0f140f460d274ec133e98ca90571d178182c3a0d8f30b9bd77d7177eed7f569583b366dee63185a13ac6ef367da6a4675bbe768afb1aeb8a
 DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
 DIST kio-5.95.0.tar.xz 3335684 BLAKE2B 5f5aa12c15a3801a5a6faa741b9cf8431d319852470a6ab730a633455eb81fab6678d236f0567e1e8a6411f090148776b6280dfbb228f907a74e7df7da6ab3c4 SHA512 33006041ba6ef74af7f3d2fdaf35aef3059d4439676bc0bfb44053e2deeff7e3cd85a88428406096b8498918d5b793cdd30f74c8d2ddf1af7ac306fe4ddd74b8
 EBUILD kio-5.92.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd
-EBUILD kio-5.95.0.ebuild 2418 BLAKE2B ffceb248c8134c27759a911f1a8abd6ad3a8da507b6a870ea9908bfa43fd5e79888861806d60d2f63d8ce8cb5b8420cdcf44f8c27e071bbe08722153ad37c137 SHA512 e5237af6e5469040474e60e773679ab7b050bd14cd0ea627ecb7f3c8199b609104138f126c2a02cf3da84e7734aa0bd5592866343b4741e2064bc62795f2f382
+EBUILD kio-5.95.0-r1.ebuild 2553 BLAKE2B 359f748745424d3c9468e8d4e2f024bfa5d8b20d83208111e5f14e30d4d9f7be7d11e8781d4531631aa14e142d627a497f8df25c7800f86d359be55d54f9ec22 SHA512 0089a64fe443cf6419b14174c3edea92a1dd1683a88799d1de1a450cf8b8da9e319d644c90cbc995ef7b886055f197d4e30e73256dc7eba59689b073befccb05
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
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
new file mode 100644
index 000000000000..5cf7b9f2fb45
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch
@@ -0,0 +1,76 @@
+From 6d47b5869d4b328614e5e95e97ef66d97009295e Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+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
new file mode 100644
index 000000000000..524fdc871fc8
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch
@@ -0,0 +1,25 @@
+From 0dd0e96c10f634974c63f85c2068e44019c27591 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven@kdemail.net>
+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
+
diff --git a/kde-frameworks/kio/kio-5.95.0.ebuild b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
index 4edd65813315..85dc54c90eef 100644
--- a/kde-frameworks/kio/kio-5.95.0.ebuild
+++ b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
@@ -70,6 +70,11 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
+PATCHES=(
+	"${FILESDIR}/${P}-filewidgets-update-filename-after-rename.patch"
+	"${FILESDIR}/${P}-fix-recent-files-in-gtk-apps.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DKIO_NO_PUBLIC_QTCONCURRENT=ON