1 |
commit: 35cb1f6518052796774bf6660423d193c6de6569 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 15 11:53:37 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 15 17:37:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cb1f65 |
7 |
|
8 |
kde-apps/libksieve: Fix build with Qt 5.14.0_beta3 |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.17 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/libksieve-19.08.3-qt-5.14.patch | 36 ++++++++++++++++++++++ |
14 |
kde-apps/libksieve/libksieve-19.08.3.ebuild | 2 ++ |
15 |
2 files changed, 38 insertions(+) |
16 |
|
17 |
diff --git a/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..403e58dd5f8 |
20 |
--- /dev/null |
21 |
+++ b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch |
22 |
@@ -0,0 +1,36 @@ |
23 |
+From 31b0ec79d4d58077bbb391c170fe9fef08d460a6 Mon Sep 17 00:00:00 2001 |
24 |
+From: Laurent Montel <montel@×××.org> |
25 |
+Date: Fri, 15 Nov 2019 12:07:37 +0100 |
26 |
+Subject: Make it compile against 5.14 beta3 |
27 |
+ |
28 |
+--- |
29 |
+ src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp | 6 ++++++ |
30 |
+ 1 file changed, 6 insertions(+) |
31 |
+ |
32 |
+diff --git a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp |
33 |
+index d4968dc..87305e9 100644 |
34 |
+--- a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp |
35 |
++++ b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp |
36 |
+@@ -16,6 +16,8 @@ |
37 |
+ */ |
38 |
+ |
39 |
+ #include "sieveeditorwebengineview.h" |
40 |
++#include <qtwebenginewidgetsversion.h> |
41 |
++ |
42 |
+ #include <KLocalizedString> |
43 |
+ #include <QContextMenuEvent> |
44 |
+ #include <QMenu> |
45 |
+@@ -61,7 +63,11 @@ void SieveEditorWebEngineView::downloadRequested(QWebEngineDownloadItem *downloa |
46 |
+ const QString filename = QFileDialog::getSaveFileName(this, i18n("Save Web Page")); |
47 |
+ if (!filename.isEmpty()) { |
48 |
+ download->setSavePageFormat(QWebEngineDownloadItem::SingleHtmlSaveFormat); |
49 |
++#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 14, 0) |
50 |
++ download->setDownloadFileName(filename); |
51 |
++#else |
52 |
+ download->setPath(filename); |
53 |
++#endif |
54 |
+ download->accept(); |
55 |
+ } else { |
56 |
+ download->cancel(); |
57 |
+-- |
58 |
+cgit v1.1 |
59 |
|
60 |
diff --git a/kde-apps/libksieve/libksieve-19.08.3.ebuild b/kde-apps/libksieve/libksieve-19.08.3.ebuild |
61 |
index 1df2bd92074..b702cee164b 100644 |
62 |
--- a/kde-apps/libksieve/libksieve-19.08.3.ebuild |
63 |
+++ b/kde-apps/libksieve/libksieve-19.08.3.ebuild |
64 |
@@ -55,6 +55,8 @@ RDEPEND="${COMMON_DEPEND} |
65 |
|
66 |
RESTRICT+=" test" |
67 |
|
68 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" ) |
69 |
+ |
70 |
src_prepare() { |
71 |
ecm_src_prepare |