diff options
Diffstat (limited to 'kde-plasma/plasma-workspace/files')
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch | 36 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch | 34 |
2 files changed, 0 insertions, 70 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch deleted file mode 100644 index 310015c7d70f..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fead4fa8174aeb6e61354390e9ddee4627b31166 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 23 Aug 2024 17:03:52 +0000 -Subject: [PATCH] klipper: fix copying cells when images are ignored - -When copying a cell to the clipboard, both the image and the plain text -will be copied, and the plain text should be saved to the history when -images are ignored. - -BUG: 491488 -FIXED-IN: 6.1.5 - - -(cherry picked from commit b83bc9a076fc0ae091f0df1eddce84d0d1dea5fd) - -Co-authored-by: Fushan Wen <qydwhotmail@gmail.com> ---- - klipper/klipper.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp -index b41129d2e1b..24446e216ef 100644 ---- a/klipper/klipper.cpp -+++ b/klipper/klipper.cpp -@@ -640,7 +640,7 @@ void Klipper::checkClipData(QClipboard::Mode mode, const QMimeData *data) - if (selectionMode && m_bSelectionTextOnly && !data->hasText()) - return; - -- if (m_bIgnoreImages && data->hasImage() && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) { -+ if (m_bIgnoreImages && data->hasImage() && !data->hasText() /*BUG 491488*/ && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) { - return; - } - --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch deleted file mode 100644 index 58a367a386ae..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dec0608369e1fe50685ce94113681ec9ed1bc43c Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Tue, 13 Aug 2024 09:09:06 +0000 -Subject: [PATCH] xembedsniproxy: Guard against crash when xcb_query_tree_reply - is null - -BUG:491509 -FIXED-IN:6.1.5 - - -(cherry picked from commit 85eb56e174bf887ccb8311e8f1a871e1ec453e04) - -Co-authored-by: David Redondo <kde@david-redondo.de> ---- - xembed-sni-proxy/sniproxy.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp -index 41e1fb0550c..21d74c566d5 100644 ---- a/xembed-sni-proxy/sniproxy.cpp -+++ b/xembed-sni-proxy/sniproxy.cpp -@@ -76,6 +76,9 @@ static bool checkWindowOrDescendantWantButtonEvents(xcb_window_t window) - } - auto treeCookie = xcb_query_tree(connection, window); - UniqueCPointer<xcb_query_tree_reply_t> tree(xcb_query_tree_reply(connection, treeCookie, nullptr)); -+ if (!tree) { -+ return false; -+ } - std::span<xcb_window_t> children(xcb_query_tree_children(tree.get()), xcb_query_tree_children_length(tree.get())); - return std::ranges::any_of(children, &checkWindowOrDescendantWantButtonEvents); - } --- -GitLab - |