gentoo auto-resync : 17:07:2024 - 12:28:31

7 files changed, 91 insertions, 2 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index e42d09724117..4afb3dceff91 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index ad1cc951e836..fa6b93215ff4 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,6 @@
+AUX kio-6.4.0-remove-parent-for-DropMenu.patch 1785 BLAKE2B 7e714201b8037177cdbe59b61841cbfb81d499f39bbfc1b199d608dee4a8f0398d1656055e11230be25d565c812c9d54a89aca4d43900a70589e9c8b5ff31457 SHA512 24b6e82727817a5ab7fae9f5dc4dd73534f28996f38538efaab4b13a43379c51c2285bb0013f4108caa09b6c1444e19dad3e6415bc476856608c4c829569eb66
 DIST kio-5.116.0.tar.xz 3800352 BLAKE2B 2197d92589bd6eba360a72fb1902bb1e97d48065834e762e681eb312797f8c54829ee6099e87f316de83913755572e7b9fe4aa1d168fa83ada519cce8980d030 SHA512 a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376
 DIST kio-6.4.0.tar.xz 3347400 BLAKE2B 8497d550b247bacfd514a404c9b74fb5620bb0f4e0e3a75c50a637d053c2377ef0399167e13bb4622d02e97be721a1431fc65a5a21b17a8c0425239a5428b5c1 SHA512 9068ea2f400848ad26bfe4b56d9489f897c02a5410d47444b5f44118f7491cd7914eee83dee095f301e910c546a60d5d2a121aea617e87fbc9c971c3ac5e3e24
 EBUILD kio-5.116.0.ebuild 2433 BLAKE2B ef2dbdc733214e9ad012fbf45564b3eb052bf3980e346977d9c9c7ec13a4cd512fcc5a6b517d9993ed333c821e885228779ea53649905c9f744025ffdd21dd0d SHA512 9ea1c94266e3f638e891fdf834919deba8ade49b4339366d8ff965a23e221c55155e5bf963f585185ef8b191c3c242d04d7c88f09cbc73196bee5fb18d72c3ee
-EBUILD kio-6.4.0.ebuild 2390 BLAKE2B ead1ccd9d44dbd77f0bb104996e517372df12f796642f54ca64aa17377317213a2ae289f743414963c7b196c41a80d49fdc28b27641c9827a36520f6fce8dadc SHA512 ffd8202492ea449e929d645abfc3a698d9ea942b12ba9851c335698aa8bcb17c24080f4667255a11ca19a5bdf0331e531a5704a3ac66fc77af13d739b5baaf4b
+EBUILD kio-6.4.0-r1.ebuild 2472 BLAKE2B b66bf1c404f5b7b4dc9ac6d03c2dcdf43d718738ff8401cc39faf582e3a8d5075273a90b66a7e70d2fe9b64cae999b04cb3795bc818245550836e80368f94542 SHA512 9d915b74d4cd241bf89333bb353644dd00e9fd1ee701d7f9c70bffbabfcb4381a19eaec05393bc38a4ad72e3e4d3bdbd5adef7a966bb9026c7d6b58bca5609c9
 MISC metadata.xml 776 BLAKE2B c30d6d930265af6c0f0d5e01e2ad7b4c7961190f013e9447dea890880f947a0ad006ac523e7363e50a58221d807e1b9ce78270800a20226906e48980eb332b6a SHA512 ccf86c003f2933287e41fcac9980f07006b3bde5a303f241d7a1fadeffa0b22656ea6e51fadd5ea5c40d7e8fa0debaf16a0ac004db317a18c99d80461bc82115
diff --git a/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch b/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
new file mode 100644
index 000000000000..596806804902
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
@@ -0,0 +1,45 @@
+From e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 15 Jul 2024 09:45:20 +0300
+Subject: [PATCH] Remove parent for DropMenu
+
+QWidget::winId() will force creating window handles for all its ancestor
+widgets unless the Qt::WA_DontCreateNativeAncestors flag is set.
+
+For example, on wayland, this would result in creating sub-surfaces, and
+depending on the client, it's likely that there are going to be issues with
+painting.
+
+On the other hand, since the DropJob takes care of setting the transient
+parent for the DropMenu, the parent can be simply omitted.
+
+BUG: 490183
+---
+ src/widgets/dropjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
+index e11e762bd0..f4a23f5688 100644
+--- a/src/widgets/dropjob.cpp
++++ b/src/widgets/dropjob.cpp
+@@ -520,8 +520,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
+ 
+     // There was an error, handle it
+     if (error == KIO::ERR_UNKNOWN) {
+-        auto *window = KJobWidgets::window(q);
+-        KIO::DropMenu *menu = new KIO::DropMenu(window);
++        KIO::DropMenu *menu = new KIO::DropMenu();
+         QObject::connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
+ 
+         // If the user clicks outside the menu, it will be destroyed without emitting the triggered signal.
+@@ -541,6 +540,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
+                     menu->windowHandle()->setTransientParent(transientParent);
+                 }
+             }
++            auto *window = KJobWidgets::window(q);
+             menu->popup(window ? window->mapToGlobal(m_relativePos) : QCursor::pos());
+         }
+         m_menus.insert(menu);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-6.4.0.ebuild b/kde-frameworks/kio/kio-6.4.0-r1.ebuild
index 7324740c524b..556fbe131d4d 100644
--- a/kde-frameworks/kio/kio-6.4.0.ebuild
+++ b/kde-frameworks/kio/kio-6.4.0-r1.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
 
+PATCHES=( "${FILESDIR}/${P}-remove-parent-for-DropMenu.patch" ) # KDE-bug 490183
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package acl ACL)
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 1a59a0b121a8..1682baa2eeec 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,6 @@
+AUX knewstuff-6.4.0-fix-reference-error.patch 1775 BLAKE2B fe28b33d997e44edcfb8bb796c804a7d10377332bd4afcf3ca0e4568ccdfb31934071e02f39b9356eb62017858a92f63279db1567bb963f382004e6df25d4626 SHA512 00721cf17d672ddc0e3a26a9a3331ff2b81ad6ba09540b1dfd98cf9545a63a5386bb7a94825be7e7252d514ef3fb313e7171d9cc309f19ae7966447b07036479
 DIST knewstuff-5.116.0.tar.xz 3359252 BLAKE2B 76df212d33e2ff3a4e47024c8007dcf5e595a892d4ddc5e3579639cc2ec86589392c8a9e53ae5e39d8b71b632a84b1d615291f44635e43514ddb2468c8e4d0d5 SHA512 c66f8905c622964a81609d384ea64c0614714b4d760ee908e2efcdaab4ef146fc2af099625e81b83c2e43e4f97a0f5960dae345cbf9d8453a15b465536c06152
 DIST knewstuff-6.4.0.tar.xz 3092488 BLAKE2B c33565d331b271f1d2e0eb6054517cf38838f737be4fb9c8282f5581a7c5ee384e2c0f7672484b72a8590d02d18b90c1085770801bd0bf59ba1753b09f1a39b1 SHA512 1ed697dc896052c7096ce8711776971447c9414b9d2ea1dd5c70a4cfc316a241af7ae17db6e4daf90edb73f12e16a6da3a7f0e09a2ebf1cb099e6a9d19c95aad
 EBUILD knewstuff-5.116.0.ebuild 1271 BLAKE2B 149ca7ffbd932e72ac0a57b6c6a32bf24b3fe0691ed40089490fba823fd06871e8e06323e72292f48db492611947cd8ad39f85456f806c599aca6ac2e6ae611a SHA512 79c8a10fa091031f4c174688c6684d66612d9aa528b64ba3a8f621f84f2627f04832f5266fa844c162fb86fb14c04e0aef0331cd25bb5f20d73a69d6963ba4da
-EBUILD knewstuff-6.4.0.ebuild 970 BLAKE2B e646fd47d5fa836c5f098d64bdf7c306dcdfe87349a404a5b44159554165aa684f9893ddb4aaa077103999ef38d0a518d0888618d147cdef62caacf13cadd35a SHA512 9491771ec4014b5bf515241c6696e5d98d9b7c2b630860fc31e617a1ac111ae154267084c239e01d8b5f39c87cb16c98383de47fe0296031eb8ec3340911a773
+EBUILD knewstuff-6.4.0-r1.ebuild 1045 BLAKE2B c981669da9b98f9b0e6c4d1c319c9438e1a3e5933cade58a5a4bf7916ffacc74fcce50c4e21afea988af6016b47e236498d1a9afb3efab39b46bf7aacd717b80 SHA512 35453898b15a2533876817bf6c00e9b79948b2134e5f25870f7b6bde8bf1e5a25bd1a36b708cca1d6bf481866b92cdab2a5cdf1fc3016a2c58c8998cd1c54799
 MISC metadata.xml 676 BLAKE2B 708e2ec870917092478d1d1c3154f7c2d412876ed2f1863c367a627c368e74e1302c5581be2ee3a147a577e0960ab4ce88d334fb0c19addcb502e71013e3c1b1 SHA512 44b7adbb024316af56842afd8d33b36b680fd0b8d64c7f8046fd90f3d0c4a21a1e7f99c598ad05a185106b52b15c39467e1066aa4c593bde0ba06a23d8ab235a
diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
new file mode 100644
index 000000000000..536b8d7533ea
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-6.4.0-fix-reference-error.patch
@@ -0,0 +1,38 @@
+From f8fb221d6f355c4f0873592fbf7dce358f4f0b40 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen <akselmo@akselmo.dev>
+Date: Fri, 12 Jul 2024 12:58:53 +0000
+Subject: [PATCH] EntryDetails.qml: Qualify newStuffModel, use downloadItemId
+
+There is no such thing as entryId, change it to downloadItemId
+Otherwise the item wont download anything.
+
+This fixes a bug where in detailed item view, if the list with multiple downloads
+appears and user clicks download, nothing would happen and knewstuff would report this
+warning in terminal: `qrc:/qt/qml/org/kde/newstuff/EntryDetails.qml:88: ReferenceError: entryId is not defined`
+
+After this fix it will download items.
+
+BUG:483659
+---
+ src/qtquick/qml/EntryDetails.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtquick/qml/EntryDetails.qml b/src/qtquick/qml/EntryDetails.qml
+index d21e18fc2..94fc88d76 100644
+--- a/src/qtquick/qml/EntryDetails.qml
++++ b/src/qtquick/qml/EntryDetails.qml
+@@ -85,9 +85,9 @@ KCMUtils.SimpleKCM {
+         parent: component.QQC2.Overlay.overlay
+ 
+         onItemPicked: (entry, downloadItemId, downloadName) => {
+-            const entryName = newStuffModel.data(newStuffModel.index(entryId, 0), NewStuff.ItemsModel.NameRole);
++            const entryName = component.newStuffModel.data(component.newStuffModel.index(downloadItemId, 0), NewStuff.ItemsModel.NameRole);
+             applicationWindow().showPassiveNotification(i18ndc("knewstuff6", "A passive notification shown when installation of an item is initiated", "Installing %1 from %2", downloadName, entryName), 1500);
+-            newStuffModel.engine.install(component.entry, downloadItemId);
++            component.newStuffModel.engine.install(component.entry, downloadItemId);
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-6.4.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild
index 983f48210930..266488aa0e98 100644
--- a/kde-frameworks/knewstuff/knewstuff-6.4.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-6.4.0-r1.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:6
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-reference-error.patch" ) # KDE-bug 483659
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package opds KF6Syndication)