diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /kde-frameworks/khtml/files | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'kde-frameworks/khtml/files')
| -rw-r--r-- | kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch | 42 |
1 files changed, 42 insertions, 0 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 new file mode 100644 index 000000000000..c6ed34998037 --- /dev/null +++ b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch @@ -0,0 +1,42 @@ +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 + |