1 |
commit: 26d44ed1713e1e1e3d08c32419ba16ec9cbd5d7f |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Feb 8 16:00:13 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 9 09:52:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d44ed1 |
7 |
|
8 |
kde-apps/akregator: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/akregator-18.12.0-qt-5.11-crashfix.patch | 81 ---------------------- |
14 |
1 file changed, 81 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch |
17 |
deleted file mode 100644 |
18 |
index f13512117a9..00000000000 |
19 |
--- a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch |
20 |
+++ /dev/null |
21 |
@@ -1,81 +0,0 @@ |
22 |
-From 91a4ab57a82970bd75eee4a7aee61a7e1c1321ef Mon Sep 17 00:00:00 2001 |
23 |
-From: Andras Mantia <andras@××××.com> |
24 |
-Date: Thu, 13 Dec 2018 17:32:52 +0200 |
25 |
-Subject: Don't crash with Qt 5.11+ |
26 |
- |
27 |
-Summary: |
28 |
-Based on the patch from https://bugs.kde.org/show_bug.cgi?id=371511 |
29 |
-See also https://bugreports.qt.io/browse/QTBUG-72260 |
30 |
- |
31 |
-BUG: 371511 |
32 |
- |
33 |
-Reviewers: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent |
34 |
- |
35 |
-Reviewed By: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent |
36 |
- |
37 |
-Subscribers: marten, asturmlechner, kfunk, kde-pim |
38 |
- |
39 |
-Tags: #kde_pim |
40 |
- |
41 |
-Differential Revision: https://phabricator.kde.org/D17563 |
42 |
---- |
43 |
- .../webengine/articleviewerwebengine.cpp | 22 ++++++++++++++++++++++ |
44 |
- 1 file changed, 22 insertions(+) |
45 |
- |
46 |
-diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp |
47 |
-index 2463fdf..174c09a 100644 |
48 |
---- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp |
49 |
-+++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp |
50 |
-@@ -46,6 +46,7 @@ |
51 |
- #include <QMenu> |
52 |
- #include <viewerplugintoolmanager.h> |
53 |
- #include <QWebEngineProfile> |
54 |
-+#include <QWebEngineUrlRequestInterceptor> |
55 |
- |
56 |
- #include <WebEngineViewer/WebHitTestResult> |
57 |
- #include <WebEngineViewer/WebHitTest> |
58 |
-@@ -57,6 +58,19 @@ |
59 |
- |
60 |
- using namespace Akregator; |
61 |
- |
62 |
-+class AkregatorRequestInterceptor : public QWebEngineUrlRequestInterceptor |
63 |
-+{ |
64 |
-+ Q_OBJECT |
65 |
-+ |
66 |
-+public: |
67 |
-+ explicit AkregatorRequestInterceptor(QObject *parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) { |
68 |
-+ } |
69 |
-+ |
70 |
-+ void interceptRequest(QWebEngineUrlRequestInfo &info) override { |
71 |
-+ Q_UNUSED(info); |
72 |
-+ } |
73 |
-+}; |
74 |
-+ |
75 |
- ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent) |
76 |
- : WebEngineViewer::WebEngineView(parent) |
77 |
- , mActionCollection(ac) |
78 |
-@@ -64,10 +78,16 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p |
79 |
- , mViewerPluginToolManager(nullptr) |
80 |
- { |
81 |
- mNetworkAccessManager = new WebEngineViewer::InterceptorManager(this, ac, this); |
82 |
-+ |
83 |
- QWebEngineProfile *profile = QWebEngineProfile::defaultProfile(); |
84 |
- mPageEngine = new ArticleViewerWebEnginePage(profile, this); |
85 |
- profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies); |
86 |
- |
87 |
-+ // Needed to workaround crash in webengine, see https://bugreports.qt.io/browse/QTBUG-72260 |
88 |
-+ auto webEngineUrlInterceptor = new AkregatorRequestInterceptor(); |
89 |
-+ profile->setRequestInterceptor(webEngineUrlInterceptor); |
90 |
-+ connect(profile, &QObject::destroyed, webEngineUrlInterceptor, &AkregatorRequestInterceptor::deleteLater); |
91 |
-+ |
92 |
- setPage(mPageEngine); |
93 |
- |
94 |
- connect(this, &ArticleViewerWebEngine::showContextMenu, this, &ArticleViewerWebEngine::slotShowContextMenu); |
95 |
-@@ -494,3 +514,5 @@ void ArticleViewerWebEngine::slotActivatePlugin(MessageViewer::ViewerPluginInter |
96 |
- interface->setUrl(mCurrentUrl); |
97 |
- interface->execute(); |
98 |
- } |
99 |
-+ |
100 |
-+#include "articleviewerwebengine.moc" |
101 |
--- |
102 |
-cgit v1.1 |