gentoo auto-resync : 14:12:2022 - 21:31:20

4 files changed, 98 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 7b05d691fae1..0f3d471ee9bc 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 3a00a58af9c9..9c0ca5f99431 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-22.12.0-revert-portalize-drag-urls.patch 3196 BLAKE2B 3061764a9d8c2f536209cf5d74e1e00400cfb46915013657724e8acceff07f5fb2880b260ce29e6e91e13479297ce7ad0ec4df354eb7b598850bd7e59c46f50b SHA512 84a951bab672af9125a64e0f163dedd065a7ea1d382d4acebea3d5b9f380815c390059873fb9944c079c8543046c6eccaca5eab57770caa6ae7ded54a8cb394a
 DIST dolphin-22.08.3.tar.xz 5369436 BLAKE2B c1d60aa79603a40ad559f1bcac8d9211e0032c58374d2268ec7530c8a3e38233271b990e24eabaa258085942f5c0dfa9a9c6a91da92caee45dd165670d62918c SHA512 1abb4f3fe47c61eef93378e069b11c894812892b5a3aec84a2ee2007a235b37aec02d2a9680581d2092596c680427e8eabbac2a0b5b64e48c7d7ea1da8f0c5b5
 DIST dolphin-22.12.0.tar.xz 5681492 BLAKE2B bd25b13b6b492131361f1723076e54d2856514b19d5637136cb90ef5b176fba250c98a76908c358482008bc9da195918a9a6acfd44b97dd7871d9a896ac68f2b SHA512 051dde0f79839cd1e34fe41536fd4a78ce336e0c2d4622da6cd213f3daccd9c0112751d75429f3f7bdce606bdba66a3fd34b5bcc3c80e6297051622ce3f454ad
 EBUILD dolphin-22.08.3.ebuild 3114 BLAKE2B 7a03efe1359682dd2f456c885f110b873665bc0ab05c3e14ced4971953bb60e1dbcc5e44bd1b38d75c1deb140d4fa07884ae80d1223c6d57cfa63c854e9ff7e9 SHA512 9645856c50c3efc6d6fb9d9e4ddd64edc76cc5f3ba167adf19e03e68cae78232ad3eb2e1e4743231a91bc074e5ab577a6f9be56c677b64c2c9b5cea72b1af8c8
-EBUILD dolphin-22.12.0.ebuild 3117 BLAKE2B 0594f252d5d9d400f62c7e2b59d54912834ce750f8e8889cde17a2233a7e06a79e63d9c604b8376cd6e4f2c03d121c48a97586395091a9dcc84f937d5650c247 SHA512 aa95def08e1eda1b13ae6c429dedd9edfba0beb2f98ceaa1f391d3b31427a87ed10ed0d052b1e1e9f1a37e5e47ba7055260a665d5a450e9eefec948080475991
+EBUILD dolphin-22.12.0-r1.ebuild 3182 BLAKE2B 14f8276f2b7d4bc4076ef2ffd70cbd80ce37743850f4bcddf0b8c795e8bcfe08164d137f0138f040ddb2fa3ea18c994e0480c70052b71ebd8a77cc51d16b3189 SHA512 7a8de7a39bf2e1a55a89081d7ada107231da733669def1b4dd07db44610eb6135d169d053410236eefb3715be3a9f63128b1bcf97bb15c1cdb0d3a8cc6f8a0eb
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-22.12.0.ebuild b/kde-apps/dolphin/dolphin-22.12.0-r1.ebuild
index ea45e5b79ecf..c125eb9bb985 100644
--- a/kde-apps/dolphin/dolphin-22.12.0.ebuild
+++ b/kde-apps/dolphin/dolphin-22.12.0-r1.ebuild
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-revert-portalize-drag-urls.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-22.12.0-revert-portalize-drag-urls.patch b/kde-apps/dolphin/files/dolphin-22.12.0-revert-portalize-drag-urls.patch
new file mode 100644
index 000000000000..417c3f340c6a
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-22.12.0-revert-portalize-drag-urls.patch
@@ -0,0 +1,94 @@
+From c8aed8ac81d9f7f3dc93a7570037041228a98bf4 Mon Sep 17 00:00:00 2001
+From: Felix Ernst <felixernst@kde.org>
+Date: Wed, 14 Dec 2022 12:33:51 +0000
+Subject: [PATCH] Revert "portalize drag urls"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 8d7e600f63a1961294dfe2c278a710b4ce0716e9.
+
+While this revert unfortunately removes Dolphin's ability to copy to
+sandboxed applications, the bugs being temporarily fixed by this seem
+more important. See the bugs mentioned below for details.
+
+Especially copy-pasting needs to work flawlessly for an application
+like Dolphin. After the revert this will either work correctly or – in
+the case of sandboxed applications – not at all.
+
+CCBUG: 457529
+CCBUG: 462928
+---
+ src/kitemviews/kitemlistcontroller.cpp     | 4 +---
+ src/panels/folders/treeviewcontextmenu.cpp | 1 -
+ src/views/dolphinview.cpp                  | 5 +----
+ 3 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
+index 955e418e8..29dd13aac 100644
+--- a/src/kitemviews/kitemlistcontroller.cpp
++++ b/src/kitemviews/kitemlistcontroller.cpp
+@@ -17,7 +17,6 @@
+ 
+ #include <KTwoFingerSwipe>
+ #include <KTwoFingerTap>
+-#include <KUrlMimeData>
+ 
+ #include <QAccessible>
+ #include <QApplication>
+@@ -1334,11 +1333,10 @@ void KItemListController::startDragging()
+         return;
+     }
+ 
+-    QMimeData *data = m_model->createMimeData(selectedItems);
++    QMimeData* data = m_model->createMimeData(selectedItems);
+     if (!data) {
+         return;
+     }
+-    KUrlMimeData::exportUrlsToPortal(data);
+ 
+     // The created drag object will be owned and deleted
+     // by QApplication::activeWindow().
+diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
+index 893a494fb..e0da9e976 100644
+--- a/src/panels/folders/treeviewcontextmenu.cpp
++++ b/src/panels/folders/treeviewcontextmenu.cpp
+@@ -168,7 +168,6 @@ void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
+     bool dummy;
+     mostLocalUrls.append(m_fileItem.mostLocalUrl(&dummy));
+     KIO::setClipboardDataCut(mimeData, cut);
+-    KUrlMimeData::exportUrlsToPortal(mimeData);
+     KUrlMimeData::setUrls(kdeUrls, mostLocalUrls, mimeData);
+ }
+ 
+diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
+index e8603858f..88f275557 100644
+--- a/src/views/dolphinview.cpp
++++ b/src/views/dolphinview.cpp
+@@ -45,7 +45,6 @@
+ #include <KLocalizedString>
+ #include <KMessageBox>
+ #include <KProtocolManager>
+-#include <KUrlMimeData>
+ 
+ #include <kwidgetsaddons_version.h>
+ 
+@@ -802,14 +801,12 @@ void DolphinView::cutSelectedItemsToClipboard()
+ {
+     QMimeData* mimeData = selectionMimeData();
+     KIO::setClipboardDataCut(mimeData, true);
+-    KUrlMimeData::exportUrlsToPortal(mimeData);
+     QApplication::clipboard()->setMimeData(mimeData);
+ }
+ 
+ void DolphinView::copySelectedItemsToClipboard()
+ {
+-    QMimeData *mimeData = selectionMimeData();
+-    KUrlMimeData::exportUrlsToPortal(mimeData);
++    QMimeData* mimeData = selectionMimeData();
+     QApplication::clipboard()->setMimeData(mimeData);
+ }
+ 
+-- 
+GitLab
+