1 |
commit: 7738f0b375720dd9e0fa71a9a8aa6d0df8501b23 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 26 15:36:58 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 26 15:36:58 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7738f0b3 |
7 |
|
8 |
kde-apps/kdepim-runtime: Fix runtime crash when configuring imap resource |
9 |
|
10 |
Reported-by: Niels Dettenbach <nd <AT> syndicat.com> |
11 |
Gentoo-bug: 619548 |
12 |
|
13 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
14 |
|
15 |
...depim-runtime-17.04.1-imap-resource-crash.patch | 37 ++++++++++ |
16 |
.../kdepim-runtime-17.04.1-r1.ebuild | 81 ++++++++++++++++++++++ |
17 |
2 files changed, 118 insertions(+) |
18 |
|
19 |
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..6b9eb2266a0 |
22 |
--- /dev/null |
23 |
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch |
24 |
@@ -0,0 +1,37 @@ |
25 |
+From 611510d0a005bc93102aa4b9f1a5b5f9905c4179 Mon Sep 17 00:00:00 2001 |
26 |
+From: Montel Laurent <montel@×××.org> |
27 |
+Date: Mon, 24 Apr 2017 12:32:36 +0200 |
28 |
+Subject: Fix Bug 379155 - Imap resources crash when trying to open settings |
29 |
+ |
30 |
+BUG: 379155 |
31 |
+--- |
32 |
+ resources/imap/setupserver.cpp | 4 ++-- |
33 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
34 |
+ |
35 |
+diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp |
36 |
+index afaa678..2912972 100644 |
37 |
+--- a/resources/imap/setupserver.cpp |
38 |
++++ b/resources/imap/setupserver.cpp |
39 |
+@@ -597,8 +597,8 @@ void SetupServer::slotComplete() |
40 |
+ |
41 |
+ void SetupServer::slotSafetyChanged() |
42 |
+ { |
43 |
+-#ifdef WITH_GMAIL_XOAUTH2 |
44 |
+ if (m_serverTest == nullptr) { |
45 |
++#ifdef WITH_GMAIL_XOAUTH2 |
46 |
+ const bool isGmail = Utils::isGmail(m_ui->imapServer->text()); |
47 |
+ qCDebug(IMAPRESOURCE_LOG) << "serverTest null"; |
48 |
+ m_ui->noRadio->setEnabled(!isGmail); |
49 |
+@@ -606,9 +606,9 @@ void SetupServer::slotSafetyChanged() |
50 |
+ m_ui->tlsRadio->setEnabled(!isGmail); |
51 |
+ |
52 |
+ m_ui->authenticationCombo->setEnabled(!isGmail); |
53 |
++#endif |
54 |
+ return; |
55 |
+ } |
56 |
+-#endif |
57 |
+ QVector<int> protocols; |
58 |
+ |
59 |
+ switch (m_ui->safeImapGroup->checkedId()) { |
60 |
+-- |
61 |
+cgit v0.11.2 |
62 |
|
63 |
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild |
64 |
new file mode 100644 |
65 |
index 00000000000..0bc02e395f6 |
66 |
--- /dev/null |
67 |
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild |
68 |
@@ -0,0 +1,81 @@ |
69 |
+# Copyright 1999-2017 Gentoo Foundation |
70 |
+# Distributed under the terms of the GNU General Public License v2 |
71 |
+ |
72 |
+EAPI=6 |
73 |
+ |
74 |
+KDE_HANDBOOK="forceoptional" |
75 |
+KDE_TEST="forceoptional" |
76 |
+VIRTUALX_REQUIRED="test" |
77 |
+inherit kde5 |
78 |
+ |
79 |
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" |
80 |
+LICENSE="GPL-2+ LGPL-2.1+" |
81 |
+KEYWORDS="~amd64 ~x86" |
82 |
+IUSE="google" |
83 |
+ |
84 |
+# TODO kolab, Qt5TextToSpeech |
85 |
+CDEPEND=" |
86 |
+ $(add_frameworks_dep kcodecs) |
87 |
+ $(add_frameworks_dep kcompletion) |
88 |
+ $(add_frameworks_dep kconfig) |
89 |
+ $(add_frameworks_dep kconfigwidgets) |
90 |
+ $(add_frameworks_dep kcoreaddons) |
91 |
+ $(add_frameworks_dep kdbusaddons) |
92 |
+ $(add_frameworks_dep kdelibs4support) |
93 |
+ $(add_frameworks_dep ki18n) |
94 |
+ $(add_frameworks_dep kio) |
95 |
+ $(add_frameworks_dep kitemmodels) |
96 |
+ $(add_frameworks_dep kjobwidgets) |
97 |
+ $(add_frameworks_dep knotifications) |
98 |
+ $(add_frameworks_dep knotifyconfig) |
99 |
+ $(add_frameworks_dep kservice) |
100 |
+ $(add_frameworks_dep ktextwidgets) |
101 |
+ $(add_frameworks_dep kwallet) |
102 |
+ $(add_frameworks_dep kwidgetsaddons) |
103 |
+ $(add_frameworks_dep kwindowsystem) |
104 |
+ $(add_frameworks_dep kxmlgui) |
105 |
+ $(add_kdeapps_dep akonadi) |
106 |
+ $(add_kdeapps_dep akonadi-calendar) |
107 |
+ $(add_kdeapps_dep akonadi-contacts) |
108 |
+ $(add_kdeapps_dep akonadi-mime) |
109 |
+ $(add_kdeapps_dep akonadi-notes) |
110 |
+ $(add_kdeapps_dep kalarmcal) |
111 |
+ $(add_kdeapps_dep kcalcore) |
112 |
+ $(add_kdeapps_dep kcalutils) |
113 |
+ $(add_kdeapps_dep kcontacts) |
114 |
+ $(add_kdeapps_dep kdav) |
115 |
+ $(add_kdeapps_dep kidentitymanagement) |
116 |
+ $(add_kdeapps_dep kimap) |
117 |
+ $(add_kdeapps_dep kmailtransport) |
118 |
+ $(add_kdeapps_dep kmbox) |
119 |
+ $(add_kdeapps_dep kmime) |
120 |
+ $(add_qt_dep qtdbus) |
121 |
+ $(add_qt_dep qtgui) |
122 |
+ $(add_qt_dep qtnetwork) |
123 |
+ $(add_qt_dep qtwebengine 'widgets') |
124 |
+ $(add_qt_dep qtwidgets) |
125 |
+ $(add_qt_dep qtxml) |
126 |
+ dev-libs/cyrus-sasl:2 |
127 |
+ dev-libs/libical:= |
128 |
+ google? ( $(add_kdeapps_dep libkgapi) ) |
129 |
+" |
130 |
+DEPEND="${CDEPEND} |
131 |
+ $(add_qt_dep qtxmlpatterns) |
132 |
+ dev-libs/libxslt |
133 |
+" |
134 |
+RDEPEND="${CDEPEND} |
135 |
+ !kde-apps/kdepim-l10n |
136 |
+ $(add_frameworks_dep oxygen-icons) |
137 |
+" |
138 |
+ |
139 |
+RESTRICT+=" test" |
140 |
+ |
141 |
+PATCHES=( "${FILESDIR}/${P}-imap-resource-crash.patch" ) |
142 |
+ |
143 |
+src_configure() { |
144 |
+ local mycmakeargs=( |
145 |
+ $(cmake-utils_use_find_package google KPimGAPI) |
146 |
+ ) |
147 |
+ |
148 |
+ kde5_src_configure |
149 |
+} |