gentoo resync : 09.07.2022

14 files changed, 366 insertions, 5 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index e0c64ab0b0dc..1787ac96cfb0 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 40170202bf1f..a8e9047d7faa 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,6 @@
+AUX kdeclarative-5.95.0-fix-potd-centered.patch 2116 BLAKE2B 40d26797da63d66d3340de37077a86f8d4ed59b9ecb50ec3eca398a2ca9d20282839ae92746aea3a488df0d3513ce129f34aa8594857ace532653395a6ef65d0 SHA512 f8220241c41c23dc75bed5f26889db72b05526902a41a1d13f8aa25970c93ec6207b5167f63e6596973bb423fe57f89129a5364a98d98dafbf20c2fe45e39d92
 DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
 DIST kdeclarative-5.95.0.tar.xz 205716 BLAKE2B 7cff9307f5098513e65416868845fe3b892da30c97fa01b6e6eca95dc15517d8aa67423fddfb78e2695a7df47b7c9f083534ac993b5b87a0f9b692d725b22d52 SHA512 bedacd087b7215b38ec83291c853238f759532b7fd5941cc02771746002a08233985b624ac31bd926bcd18fb2eca6e703f0a7ae83439a3e63657d6aa3ea647c0
 EBUILD kdeclarative-5.92.0.ebuild 944 BLAKE2B eedca9ff52fd3d86b73ea12b8251efe7aa1136631a5eb69b118c91cc9ec506310ec9e4e62e0948089c30c4fef95373e50e95d9e87791aa034f88f70e5888ef3f SHA512 3ce5b83d7ad536f0e69d156b8ef61bc09591acbe5bd6b62815d445e2af0ad78c245d6e721638fd314ff16ec48afba355caba0bb59df1d63086dc1435a3ac584b
-EBUILD kdeclarative-5.95.0.ebuild 954 BLAKE2B 5137c2e59a7083b3e883e667fb58685e26c510dc5aa0f4c5df03d8ac2bac960ae1ef943b78f21b141b5a193c5650b306c0ff6f927a862b2b368828e842855b6c SHA512 9c058359b6572e1fa4e930f9016ab8d1d4b11e4e87bc29556880e90f6804336102ffbb77ca7e1aaa35bc699ab6c1f8c2bb10da1a777a9a489177d3cd8d0c397a
+EBUILD kdeclarative-5.95.0-r1.ebuild 1010 BLAKE2B 872a1732a463eaef2adeee5ba8236ab4ed5ea04e0d06c063ad5c7dd51eaea1f1e5ce3628d0a8debc6dc818a11a8a73bdf17a8c39cdb15bc56d433121098dc2a4 SHA512 de7d3dd904efda8701496fd423e728ec910ebcb5ef60a4daa4b8dcb8e01533fe8719897353078806564d4c7333c533cb1cf618ed479412bae1dc220293047798
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
new file mode 100644
index 000000000000..cac44a4333bf
--- /dev/null
+++ b/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
@@ -0,0 +1,54 @@
+From 41b3d0b142387c3acbba73f6ac332b3f314f7700 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Thu, 9 Jun 2022 12:57:55 +0800
+Subject: [PATCH] qmlcontrols: add `Pad` fill mode in `QImageItem`
+
+This matches the behavior in `QQuickImage`.
+
+BUG: 389623
+FIXED-IN: 5.96
+---
+ src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp | 7 ++++++-
+ src/qmlcontrols/kquickcontrolsaddons/qimageitem.h   | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
+index 36929eed..060069a1 100644
+--- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
++++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
+@@ -103,7 +103,11 @@ void QImageItem::paint(QPainter *painter)
+         painter->scale(1, height() / (qreal)m_image.height());
+     }
+ 
+-    if (m_fillMode >= Tile) {
++    if (m_fillMode == Pad) {
++        QRect centeredRect = m_paintedRect;
++        centeredRect.moveCenter(m_image.rect().center());
++        painter->drawImage(m_paintedRect, m_image, centeredRect);
++    } else if (m_fillMode >= Tile) {
+         painter->drawTiledPixmap(m_paintedRect, QPixmap::fromImage(m_image));
+     } else {
+         painter->drawImage(m_paintedRect, m_image, m_image.rect());
+@@ -174,6 +178,7 @@ void QImageItem::updatePaintedRect()
+     }
+     case Stretch:
+     case Tile:
++    case Pad:
+     default:
+         destRect = boundingRect().toRect();
+     }
+diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
+index f32ae7da..ba38a4a1 100644
+--- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
++++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
+@@ -32,6 +32,7 @@ public:
+         Tile, // the image is duplicated horizontally and vertically
+         TileVertically, // the image is stretched horizontally and tiled vertically
+         TileHorizontally, // the image is stretched vertically and tiled horizontally
++        Pad, /**< the image is not transformed @since 5.96 **/
+     };
+     Q_ENUM(FillMode)
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.95.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
index b2097f97efc7..6d2b7ad1ccae 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.95.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
@@ -33,3 +33,5 @@ DEPEND="
 	media-libs/libepoxy
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-potd-centered.patch" )
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 37921cdd5e21..d20c5d94265d 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,6 @@
+AUX kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch 5674 BLAKE2B 9a6f1bf039b1431fd87ec318c3d8fbd1fa618ff9f71f3fb20994ca27619568368391179e93c4604b0d27d06dfbbdd4e5668df9d33a6a45ca2d4e3f8563322a2f SHA512 bce81f0336c8f7f1a0ee7ab550eb0c48486bc8bcdd24af754790ad737be734df130c46f1dbebe642d5c4a60b51ca1f5c793309437507f892a9fb4b73e69ba702
 DIST kglobalaccel-5.92.0.tar.xz 93704 BLAKE2B a7b38b1c7b6bd0a7d20de7dd1893ae42d70888262fff6e196b8c64b5dd16d0c1ec5f8aaa44e1a0cbd39cc675df957e3e86c509ea7418105ef4df1071502d3c41 SHA512 b839dff3fcf191b2bdd99d6ba2e66169e86e73bef06bfaf990a30ad2d4a89d9150c798297f9cd98407a4ff390252b5d15fed8e51fc76a01199498099aa45f9cc
 DIST kglobalaccel-5.95.0.tar.xz 96196 BLAKE2B 7cf871861f243908f58bf0692305cc4a29e18e40a70547175d8a6c725f5c5843fe7bfbea05d308ae75e4e8e0ea2791f8cf77e23ddd72e3eb2e4bbd1bf9c4666a SHA512 defb559a87eb32afdec48f22ad0b28a5b8bfcc8cbdffb9babe9e00e5ebf4a530841261632b37d0e6df04c46c102a1a16e4301d5ef6b2c59d0978e2f6b5857b10
 EBUILD kglobalaccel-5.92.0.ebuild 886 BLAKE2B eab826dd3ab025d67739d127a98a77b2a5e0808ab15c1d6a80bf42505fbb567ac9f4b71d20c8fdf5b9bfa6a4c9980a4ed629752245f5a1f21017b9662c46a61c SHA512 e2a107a207a8223845884cc9166cd65da0b6a667ec8fc6054cc32173d2bedae3651bb90e8a3ad156d3c86c995dcacae3031725d16ae7b6ee78e3340aeddead53
-EBUILD kglobalaccel-5.95.0.ebuild 1028 BLAKE2B 22d6e18aad78ef4b4cbd6d70cab637656b8c900bc8eb1f65def8cb6251a103acd93f70cb9740b6077aee28e7335d165f39046f3c1bfeca90cddd415d034a1015 SHA512 eb8a1df85918f4777151d73af87cf33a41cda31d8ce6e9793f2a5628a3d94946ba33517f5f5e85282db7fe98ff28a05e8a76730ab59de8efa4a84bcdaaa94359
+EBUILD kglobalaccel-5.95.0-r1.ebuild 1095 BLAKE2B 7980b96b98bc3945c3f301b49a5bbfdc97517aefd4f725eca4e86a65acd5a11730af5a2a355e7a426daa3d8888f7725aebe7240883ba365797223fd60f11067c SHA512 1c894300073c44f3da0a724186bd09d867381905c15fbb7e9552d8813764bb21be93a873c5b44255e0e41ca27a6e0b69380584ee38ce7f838e55be9cec23291f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch
new file mode 100644
index 000000000000..c39f30d86d3c
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.95.0-fix-shortcut-conflict-dialog.patch
@@ -0,0 +1,151 @@
+From 1a8e8cb00cda5807926a90ae8e5d5597354f3541 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sat, 4 Jun 2022 23:00:15 +0200
+Subject: [PATCH] Fix D-Bus de/marshalling KGlobalAccel::MatchType
+
+Otherwise the globalShortcutsByKey() method is silently skipped, and isn't
+visible on the org.kde.KGlobalAccel D-Bus interface.
+
+It turns out that to test changes made in kglobalaccel d-bus interface, you
+need to kill the system /usr/bin/kglobalaccel process (be careful as that
+breaks the most basic shortcuts, e.g. Alt+Tab), and run the one from the
+build-dir, otherwise the session d-bus won't pick up your changes.
+
+To test:
+- List all methods on the interface:
+  `qdbus org.kde.kglobalaccel /kglobalaccel`
+- The followin messages are printed in the system log/journal:
+Skipped method "globalShortcutsByKey" : Unregistered input type in parameter list: KGlobalAccel::MatchType
+Skipped method "globalShortcutsByKey" : Unregistered input type in parameter list: KGlobalAccel::MatchType
+
+To see the behaviour mentioned in the bug report:
+- Create a global shortcut of some kind (e.g. F4 to start some app)
+- open the shortcut editor in e.g. Dolphin, and try to assign that same
+  shortcut to some other action the conflict shortcut message dialog should
+  show a message similar to the one in the attached screenshot at:
+  https://bugs.kde.org/show_bug.cgi?id=454704#c0
+The list of GlobalShortcutInfo returned by globalShortcutsByKey() is empty
+because the method couldn't be found on the d-bus interface.
+
+After applying patch:
+- kill the system /usr/bin/kglobalaccel and start the one from the build
+  dir
+- Start Dolphin with the libs from the build-dir e.g.:
+  LD_LIBRARY_PATH=build-dir/bin/ dolphin
+- The info about the global shortcut should be shown in the message dialog
+
+BUG: 454704
+FIXED-IN: 5.95
+---
+ src/kglobalaccel.cpp          | 19 +++++++++++++++++++
+ src/kglobalaccel.h            |  3 +++
+ src/kglobalshortcutinfo_p.h   |  1 +
+ src/org.kde.KGlobalAccel.xml  |  3 ++-
+ src/runtime/kglobalacceld.cpp |  4 ++--
+ 5 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp
+index d0d2932..ef51b56 100644
+--- a/src/kglobalaccel.cpp
++++ b/src/kglobalaccel.cpp
+@@ -147,6 +147,7 @@ KGlobalAccel::KGlobalAccel()
+     qDBusRegisterMetaType<QList<QStringList>>();
+     qDBusRegisterMetaType<KGlobalShortcutInfo>();
+     qDBusRegisterMetaType<QList<KGlobalShortcutInfo>>();
++    qDBusRegisterMetaType<KGlobalAccel::MatchType>();
+ }
+ 
+ KGlobalAccel::~KGlobalAccel()
+@@ -785,4 +786,22 @@ bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QK
+     return true;
+ }
+ 
++QDBusArgument &operator<<(QDBusArgument &argument, const KGlobalAccel::MatchType &type)
++{
++    argument.beginStructure();
++    argument << static_cast<int>(type);
++    argument.endStructure();
++    return argument;
++}
++
++const QDBusArgument &operator>>(const QDBusArgument &argument, KGlobalAccel::MatchType &type)
++{
++    argument.beginStructure();
++    int arg;
++    argument >> arg;
++    type = static_cast<KGlobalAccel::MatchType>(arg);
++    argument.endStructure();
++    return argument;
++}
++
+ #include "moc_kglobalaccel.cpp"
+diff --git a/src/kglobalaccel.h b/src/kglobalaccel.h
+index 563278b..a74a311 100644
+--- a/src/kglobalaccel.h
++++ b/src/kglobalaccel.h
+@@ -400,4 +400,7 @@ private:
+     friend class KGlobalAccelSingleton;
+ };
+ 
++KGLOBALACCEL_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const KGlobalAccel::MatchType &type);
++KGLOBALACCEL_EXPORT const QDBusArgument &operator>>(const QDBusArgument &argument, KGlobalAccel::MatchType &type);
++
+ #endif // _KGLOBALACCEL_H_
+diff --git a/src/kglobalshortcutinfo_p.h b/src/kglobalshortcutinfo_p.h
+index 4b9146f..b3fa620 100644
+--- a/src/kglobalshortcutinfo_p.h
++++ b/src/kglobalshortcutinfo_p.h
+@@ -13,6 +13,7 @@
+ 
+ static const int maxSequenceLength = 4;
+ 
++#include "kglobalaccel.h"
+ #include "kglobalshortcutinfo.h"
+ 
+ class KGlobalShortcutInfoPrivate
+diff --git a/src/org.kde.KGlobalAccel.xml b/src/org.kde.KGlobalAccel.xml
+index 65f93b8..d48ce87 100644
+--- a/src/org.kde.KGlobalAccel.xml
++++ b/src/org.kde.KGlobalAccel.xml
+@@ -121,7 +121,8 @@
+       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
+       <arg name="key" type="ai" direction="in"/>
+       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QKeySequence"/>
+-      <arg name="type" type="i" direction="in"/>
++      <arg name="matchType" type="KGlobalAccel::MatchType" direction="in"/>
++      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="KGlobalAccel::MatchType"/>
+     </method>
+     <method name="globalShortcutAvailable">
+       <arg type="b" direction="out"/>
+diff --git a/src/runtime/kglobalacceld.cpp b/src/runtime/kglobalacceld.cpp
+index cf22d26..e14d419 100644
+--- a/src/runtime/kglobalacceld.cpp
++++ b/src/runtime/kglobalacceld.cpp
+@@ -13,6 +13,7 @@
+ #include "globalshortcut.h"
+ #include "globalshortcutcontext.h"
+ #include "globalshortcutsregistry.h"
++#include "kglobalaccel.h"
+ #include "kserviceactioncomponent.h"
+ #include "logging_p.h"
+ 
+@@ -21,8 +22,6 @@
+ #include <QMetaMethod>
+ #include <QTimer>
+ 
+-#include "kglobalaccel.h"
+-
+ struct KGlobalAccelDPrivate {
+     KGlobalAccelDPrivate(KGlobalAccelD *qq)
+         : q(qq)
+@@ -175,6 +174,7 @@ bool KGlobalAccelD::init()
+     qDBusRegisterMetaType<QStringList>();
+     qDBusRegisterMetaType<KGlobalShortcutInfo>();
+     qDBusRegisterMetaType<QList<KGlobalShortcutInfo>>();
++    qDBusRegisterMetaType<KGlobalAccel::MatchType>();
+ 
+     GlobalShortcutsRegistry *reg = GlobalShortcutsRegistry::self();
+     Q_ASSERT(reg);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild
index bdc12b12fc32..28733db44c48 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.95.0-r1.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
 
+PATCHES=( "${FILESDIR}/${P}-fix-shortcut-conflict-dialog.patch" )
+
 src_test() {
 	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
 }
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
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index a1f99249f7d8..556cd1d36a31 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,8 +1,9 @@
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
 AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
+AUX plasma-5.95.0-fix-sizeForLabels-double-scaling.patch 2057 BLAKE2B d3e4ee4d02ea571f839d30809f980ea88ce174fc96a4c4ba68d4e593b2265c57c40e9caeb8e35561c600020fcebf9f01a55b269f301fdd9f4a807e249e9c4a5d SHA512 b019c0fbf33cc0d4f5ac210c0e69f2cc6f1a6b20920f5f519b0fbbc5ae8037af9aac9cc6709a4875ec5ac26dc86dc7c8c4735037198313de0c6dc68cd36bef7f
 AUX plasma-5.95.0-revert-QT_FEATURE_foo.patch 1515 BLAKE2B bbaeef7f8c4d7110f27371a2f1417a2ad47e9b562d0250df4c917a5aec71426307aadb6d33e67ec85c6c8a3623483eff5b01bdae38ade37820b4c7861ab2d910 SHA512 87b73e53ed0b36a43fe973e96f05280692531a0d2c445bda11b712bf3987102e8f1522ef5a4026ef55f2434c1b793f5e3d1204be87afacf47d376312b6db1af0
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
 DIST plasma-framework-5.95.0.tar.xz 3139008 BLAKE2B 55d3e32402a424e9362fec0dc06c80ac0d1754faeb0f60b6f0b447e4fef996e3c8f695300440f763ba911e02efe92d1d0a34e8cd5fd4458c4d1fe31000477097 SHA512 f5b109477b437cac9a54903ee2198df8f38bde4499f1a75288cbb299ca6b0d7b02b624bd5d741bd8e62136201811167f5406d4d98ceed2c86fa23842cd7f36af
 EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
-EBUILD plasma-5.95.0-r3.ebuild 2015 BLAKE2B 3565271a87e90a336c9a82fc46b5d76f9cac006b94ae265f4d8a219768fea40ac842f65f06f1d6da1fbebc8e0f8f0598830a60a20b318334aa3d77216fdfceaf SHA512 42d88333ed0453c84124fffb5279392345f07a53c471080885314ffe33234e9d65dc741741b011eb45353545ec5e40133cbc3afad91355b90cb34b02c0edc8fe
+EBUILD plasma-5.95.0-r4.ebuild 2075 BLAKE2B 6a2d65cb67c0450c5fa9311ab8482f2130e4d89a60426640596e68f80510d63b761a4e486f0a2e9267d396eb158e8cbe174c83a752dcef7fb9167b14bfb07180 SHA512 7138e8fa7e26b8bb8790d6a0f69a73064c9c16d7750a6f02e2d98d9b33ff245b31fb6ce989611ea246d40303ce872197f9d070f1da58fedd1470528e05fab34e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch b/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
new file mode 100644
index 000000000000..84022d815b55
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.95.0-fix-sizeForLabels-double-scaling.patch
@@ -0,0 +1,38 @@
+From 26ae86dff198fbce05ba3824b89786224b3792a9 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 23 Jun 2022 12:47:32 -0600
+Subject: [PATCH] Units: Fix sizeForLabels double-scaling icons with Plasma
+ scaling
+
+The sizeForLabels unit internally uses roundToIconSize(), giving it a
+value and feeding that into devicePixelIconSize() to take into account
+required icons size differences when using Plasma scaling. But
+roundToIconSize() internally does that automatically! So as a result,
+the size is double-scaled and looks too big. To fix this, we simply have
+to stop using devicePixelIconSize() for this unit.
+
+BUG: 454131
+FIXED-IN: 5.96
+---
+ src/declarativeimports/core/units.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
+index 0cdffcbfd..8d655d11f 100644
+--- a/src/declarativeimports/core/units.cpp
++++ b/src/declarativeimports/core/units.cpp
+@@ -115,8 +115,9 @@ void Units::iconLoaderSettingsChanged()
+     m_iconSizes->insert(QStringLiteral("large"), devicePixelIconSize(KIconLoader::SizeLarge));
+     m_iconSizes->insert(QStringLiteral("huge"), devicePixelIconSize(KIconLoader::SizeHuge));
+     m_iconSizes->insert(QStringLiteral("enormous"), devicePixelIconSize(KIconLoader::SizeEnormous));
+-    // gridUnit is always the font height here
+-    m_iconSizes->insert(QStringLiteral("sizeForLabels"), devicePixelIconSize(roundToIconSize(QFontMetrics(QGuiApplication::font()).height())));
++    // We deliberately don't feed the result into devicePixelIconSize() because
++    // roundToIconSize() already does that internally.
++    m_iconSizes->insert(QStringLiteral("sizeForLabels"), roundToIconSize(QFontMetrics(QGuiApplication::font()).height()));
+ 
+     m_iconSizeHints->insert(QStringLiteral("panel"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Panel)));
+     m_iconSizeHints->insert(QStringLiteral("desktop"), devicePixelIconSize(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r4.ebuild
index fc4992b6fe0d..0eede884b46f 100644
--- a/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
+++ b/kde-frameworks/plasma/plasma-5.95.0-r4.ebuild
@@ -59,7 +59,10 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
-PATCHES=( "${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch"
+	"${FILESDIR}/${P}-fix-sizeForLabels-double-scaling.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(