summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-12-20 20:40:18 +0000
committer Eric Hameleers <alien@slackware.com>2022-12-20 22:34:22 +0100
commita1d6f79ce8795d190466bd6e4cc3c191df8741e9 (patch)
tree27389af065425da0b60d20a760ccde265489ebc7 /source/kde/kde/patch
parent4f53dfead2169d2c8e9d22b1cdb5ed71083fb9b4 (diff)
downloadcurrent-a1d6f79ce8795d190466bd6e4cc3c191df8741e9.tar.gz
current-a1d6f79ce8795d190466bd6e4cc3c191df8741e9.tar.xz
Tue Dec 20 20:40:18 UTC 202220221220204018
d/p2c-2.02-x86_64-1.txz: Upgraded. kde/dolphin-22.12.0-x86_64-2.txz: Rebuilt. [PATCH] Revert "portalize drag urls" Thanks to marav. l/gst-plugins-bad-free-1.20.5-x86_64-1.txz: Upgraded. l/gst-plugins-base-1.20.5-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.20.5-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.20.5-x86_64-1.txz: Upgraded. l/gstreamer-1.20.5-x86_64-1.txz: Upgraded. l/libqalculate-4.5.0-x86_64-1.txz: Upgraded. l/libvncserver-0.9.14-x86_64-1.txz: Upgraded. l/sdl-1.2.15-x86_64-14.txz: Rebuilt. This update fixes a heap overflow problem in video/SDL_pixels.c in SDL. By crafting a malicious .BMP file, an attacker can cause the application using this library to crash, denial of service, or code execution. Thanks to marav for the heads-up. For more information, see: https://www.cve.org/CVERecord?id=CVE-2021-33657 (* Security fix *) n/gnupg2-2.2.41-x86_64-1.txz: Upgraded. n/libksba-1.6.3-x86_64-1.txz: Upgraded. Fix another integer overflow in the CRL's signature parser. (* Security fix *) x/libSM-1.2.4-x86_64-1.txz: Upgraded. x/xcb-util-0.4.1-x86_64-1.txz: Upgraded. x/xdriinfo-1.0.7-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/dolphin.patch2
-rw-r--r--source/kde/kde/patch/dolphin/c8aed8ac.patch94
2 files changed, 96 insertions, 0 deletions
diff --git a/source/kde/kde/patch/dolphin.patch b/source/kde/kde/patch/dolphin.patch
index 2e29b7fe5..8606b43d8 100644
--- a/source/kde/kde/patch/dolphin.patch
+++ b/source/kde/kde/patch/dolphin.patch
@@ -1,2 +1,4 @@
# Let the user decide whether it wants to run Dolphin as root:
cat $CWD/patch/dolphin/dolphin_revert_noroot.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+cat $CWD/patch/dolphin/c8aed8ac.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/dolphin/c8aed8ac.patch b/source/kde/kde/patch/dolphin/c8aed8ac.patch
new file mode 100644
index 000000000..417c3f340
--- /dev/null
+++ b/source/kde/kde/patch/dolphin/c8aed8ac.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
+