1 |
commit: 54f6bcbbc6fc2881578d1e1fd96ae0ff07f486b9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 20 12:28:03 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 20 13:24:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f6bcbb |
7 |
|
8 |
kde-frameworks/khtml: Fix crash in Wayland |
9 |
|
10 |
Upstream commit 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/khtml-5.90.0-fix-crash-in-wayland.patch | 42 +++++++++++++ |
16 |
kde-frameworks/khtml/khtml-5.90.0-r1.ebuild | 73 ++++++++++++++++++++++ |
17 |
2 files changed, 115 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 000000000000..c6ed34998037 |
22 |
--- /dev/null |
23 |
+++ b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch |
24 |
@@ -0,0 +1,42 @@ |
25 |
+From 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 Mon Sep 17 00:00:00 2001 |
26 |
+From: Christoph Cullmann <cullmann@×××.org> |
27 |
+Date: Sat, 1 Jan 2022 23:42:16 +0100 |
28 |
+Subject: [PATCH] fix khtml crash in wayland session |
29 |
+ |
30 |
+--- |
31 |
+ src/khtmlview.cpp | 5 ++++- |
32 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/src/khtmlview.cpp b/src/khtmlview.cpp |
35 |
+index 79f0d7c..75df959 100644 |
36 |
+--- a/src/khtmlview.cpp |
37 |
++++ b/src/khtmlview.cpp |
38 |
+@@ -69,6 +69,7 @@ |
39 |
+ #include <kstringhandler.h> |
40 |
+ #include <kconfiggroup.h> |
41 |
+ #include <ksharedconfig.h> |
42 |
++#include <KWindowSystem> |
43 |
+ |
44 |
+ #include <QBitmap> |
45 |
+ #include <QDialog> |
46 |
+@@ -1530,7 +1531,8 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse) |
47 |
+ |
48 |
+ if (linkCursor != LINK_NORMAL && isVisible() && hasFocus()) { |
49 |
+ #if HAVE_X11 |
50 |
+- |
51 |
++ // ensure we don't trigger this code paths if we run in a Wayland session |
52 |
++ if (KWindowSystem::isPlatformX11()) { |
53 |
+ if (!d->cursorIconWidget) { |
54 |
+ #if HAVE_X11 |
55 |
+ d->cursorIconWidget = new QLabel(nullptr, Qt::X11BypassWindowManagerHint); |
56 |
+@@ -1572,6 +1574,7 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse) |
57 |
+ //TODO? |
58 |
+ #endif |
59 |
+ d->cursorIconWidget->show(); |
60 |
++ } |
61 |
+ #endif |
62 |
+ } else if (d->cursorIconWidget) { |
63 |
+ d->cursorIconWidget->hide(); |
64 |
+-- |
65 |
+GitLab |
66 |
+ |
67 |
|
68 |
diff --git a/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild |
69 |
new file mode 100644 |
70 |
index 000000000000..050f9c3112c9 |
71 |
--- /dev/null |
72 |
+++ b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild |
73 |
@@ -0,0 +1,73 @@ |
74 |
+# Copyright 1999-2022 Gentoo Authors |
75 |
+# Distributed under the terms of the GNU General Public License v2 |
76 |
+ |
77 |
+EAPI=8 |
78 |
+ |
79 |
+ECM_QTHELP="false" |
80 |
+PVCUT=$(ver_cut 1-2) |
81 |
+QTMIN=5.15.2 |
82 |
+VIRTUALX_REQUIRED="test" |
83 |
+inherit ecm kde.org |
84 |
+ |
85 |
+DESCRIPTION="KHTML web rendering engine" |
86 |
+LICENSE="LGPL-2" |
87 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
88 |
+IUSE="X" |
89 |
+ |
90 |
+BDEPEND=" |
91 |
+ dev-lang/perl |
92 |
+ dev-util/gperf |
93 |
+" |
94 |
+RDEPEND=" |
95 |
+ dev-libs/openssl:0 |
96 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
97 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
98 |
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl] |
99 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
100 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
101 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
102 |
+ =kde-frameworks/karchive-${PVCUT}*:5 |
103 |
+ =kde-frameworks/kcodecs-${PVCUT}*:5 |
104 |
+ =kde-frameworks/kcompletion-${PVCUT}*:5 |
105 |
+ =kde-frameworks/kconfig-${PVCUT}*:5 |
106 |
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5 |
107 |
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
108 |
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5 |
109 |
+ =kde-frameworks/ki18n-${PVCUT}*:5 |
110 |
+ =kde-frameworks/kiconthemes-${PVCUT}*:5 |
111 |
+ =kde-frameworks/kio-${PVCUT}*:5 |
112 |
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5 |
113 |
+ =kde-frameworks/kjs-${PVCUT}*:5 |
114 |
+ =kde-frameworks/knotifications-${PVCUT}*:5 |
115 |
+ =kde-frameworks/kparts-${PVCUT}*:5 |
116 |
+ =kde-frameworks/kservice-${PVCUT}*:5 |
117 |
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5 |
118 |
+ =kde-frameworks/kwallet-${PVCUT}*:5 |
119 |
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
120 |
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5 |
121 |
+ =kde-frameworks/kxmlgui-${PVCUT}*:5 |
122 |
+ =kde-frameworks/sonnet-${PVCUT}*:5 |
123 |
+ media-libs/giflib:= |
124 |
+ media-libs/libpng:0= |
125 |
+ >=media-libs/phonon-4.11.0 |
126 |
+ sys-libs/zlib |
127 |
+ virtual/jpeg:0 |
128 |
+ X? ( |
129 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
130 |
+ x11-libs/libX11 |
131 |
+ ) |
132 |
+" |
133 |
+DEPEND="${RDEPEND} |
134 |
+ test? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) |
135 |
+ X? ( x11-base/xorg-proto ) |
136 |
+" |
137 |
+ |
138 |
+PATCHES=( "${FILESDIR}/${P}-fix-crash-in-wayland.patch" ) |
139 |
+ |
140 |
+src_configure() { |
141 |
+ local mycmakeargs=( |
142 |
+ $(cmake_use_find_package X X11) |
143 |
+ ) |
144 |
+ |
145 |
+ ecm_src_configure |
146 |
+} |