summaryrefslogtreecommitdiff
path: root/kde-frameworks/khtml/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /kde-frameworks/khtml/files
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'kde-frameworks/khtml/files')
-rw-r--r--kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
deleted file mode 100644
index c6ed34998037..000000000000
--- a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Sat, 1 Jan 2022 23:42:16 +0100
-Subject: [PATCH] fix khtml crash in wayland session
-
----
- src/khtmlview.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/khtmlview.cpp b/src/khtmlview.cpp
-index 79f0d7c..75df959 100644
---- a/src/khtmlview.cpp
-+++ b/src/khtmlview.cpp
-@@ -69,6 +69,7 @@
- #include <kstringhandler.h>
- #include <kconfiggroup.h>
- #include <ksharedconfig.h>
-+#include <KWindowSystem>
-
- #include <QBitmap>
- #include <QDialog>
-@@ -1530,7 +1531,8 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
-
- if (linkCursor != LINK_NORMAL && isVisible() && hasFocus()) {
- #if HAVE_X11
--
-+ // ensure we don't trigger this code paths if we run in a Wayland session
-+ if (KWindowSystem::isPlatformX11()) {
- if (!d->cursorIconWidget) {
- #if HAVE_X11
- d->cursorIconWidget = new QLabel(nullptr, Qt::X11BypassWindowManagerHint);
-@@ -1572,6 +1574,7 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
- //TODO?
- #endif
- d->cursorIconWidget->show();
-+ }
- #endif
- } else if (d->cursorIconWidget) {
- d->cursorIconWidget->hide();
---
-GitLab
-