diff options
Diffstat (limited to 'kde-frameworks/khtml')
-rw-r--r-- | kde-frameworks/khtml/Manifest | 3 | ||||
-rw-r--r-- | kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch | 42 | ||||
-rw-r--r-- | kde-frameworks/khtml/khtml-5.90.0-r1.ebuild (renamed from kde-frameworks/khtml/khtml-5.90.0.ebuild) | 2 |
3 files changed, 46 insertions, 1 deletions
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest index 3d3b6fbc0d0a..e00b5c46b27c 100644 --- a/kde-frameworks/khtml/Manifest +++ b/kde-frameworks/khtml/Manifest @@ -1,5 +1,6 @@ +AUX khtml-5.90.0-fix-crash-in-wayland.patch 1249 BLAKE2B 0b66fd470e0da8b52c88866d817f306cad197694e458b2a015ad5ced133c51e8f72b936be14e05cb663b4e830dd23f315e0aa49d855ea13d9a1f2a866d493e90 SHA512 11281fff2de04a5c177e161bb16994a769601cf6c35360e0049fab1c19325539eb00ce8f7538285c59120b22908d4d95c26d4c23da5c3801380be238eff86f1c DIST khtml-5.88.0.tar.xz 2093664 BLAKE2B 85379c7d3fffed82794c33977f8d1ebaf2670158ea52feff72db694a47a5a5223d2d91850e5ccf21cb4f495c6bd4c884aae65b65f5ba2ce3962ce9b7dc410258 SHA512 7fa39361e2353b5abdd7c92ddc91c0e9a8216a756d6976ae57249649d9fad97957793ca446a5668a7d0f44031eae3ed38c35d6331f07d1286af18f3346bc4a87 DIST khtml-5.90.0.tar.xz 2093520 BLAKE2B dbab7070371c4b426ea5027b69cc928f76b7c52a40c4373c576f568dbf69752914793445cc51b8f73c46fe625c39f9e283cd17551bb72b3266acc6cc552d3b02 SHA512 0292a7497c51a576ae9603cfa3bf49031d9bd2a5ee493be08935bcedf67d75d9a41b06d0a0829e1f08391aafb60c7145859e596885dbd3d40017d1181ee2969d EBUILD khtml-5.88.0.ebuild 1760 BLAKE2B 74d67c320828dfb8cee26876498486587ed14cf7d80115f7abc701ba213113a3f27fd40ad3240832b983c824c918a70f40362938ad34a0bd4b36ef0fc8d55039 SHA512 23806a9491e03c1c6710536275412bb06dbf9318370cef5ab718f4263d36d04ea7674d7451e86723a6875c4c9b9545e484f73329dfaa9ed57a713a718763d861 -EBUILD khtml-5.90.0.ebuild 1763 BLAKE2B 7e1b7d59c06d7a451ecd45ead7b7c54e8f2d8c44c2d3e2462adfb2273362dff954438694b876efbbc559f7168850a43f2780b3c942480c101fd45a3c9d89e193 SHA512 20af814de1fd75955b3d3d9041a3b2c8a2983b5d1d4eaca1ccc0811fb9d68716f935a063ae01834f842e0d39c2ab9b08f8dfd8908e0e0bf8ad592a106ea31793 +EBUILD khtml-5.90.0-r1.ebuild 1822 BLAKE2B f832f97b25ed48cdcae64688a626ff701d21c306ba94449358d6df38cc66c13e0576a2b8779d7b3d3cb9d8a230d0a62570644906b6cf57d6c9d748fff8bb94c9 SHA512 ed236d034a842873d3357f6a30b7d46e6552f0b5b131631f414ad56fad355a6c19e9ca1588282c26b0f4170ce91c410ff453a289496b062fe6948b120f4f2135 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 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 + diff --git a/kde-frameworks/khtml/khtml-5.90.0.ebuild b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild index 91278423475f..050f9c3112c9 100644 --- a/kde-frameworks/khtml/khtml-5.90.0.ebuild +++ b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild @@ -62,6 +62,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}/${P}-fix-crash-in-wayland.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package X X11) |