kde-apps/kdepim-runtime: Fix runtime crash when configuring imap resource

Reported-by: Niels Dettenbach <nd@syndicat.com>
Gentoo-bug: 619548

Package-Manager: Portage-2.3.5, Repoman-2.3.1

2 files changed, 118 insertions, 0 deletions

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
new file mode 100644
index 000000000000..6b9eb2266a09
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch
@@ -0,0 +1,37 @@
+From 611510d0a005bc93102aa4b9f1a5b5f9905c4179 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Mon, 24 Apr 2017 12:32:36 +0200
+Subject: Fix Bug 379155 - Imap resources crash when trying to open settings
+
+BUG: 379155
+---
+ resources/imap/setupserver.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
+index afaa678..2912972 100644
+--- a/resources/imap/setupserver.cpp
++++ b/resources/imap/setupserver.cpp
+@@ -597,8 +597,8 @@ void SetupServer::slotComplete()
+ 
+ void SetupServer::slotSafetyChanged()
+ {
+-#ifdef WITH_GMAIL_XOAUTH2
+     if (m_serverTest == nullptr) {
++#ifdef WITH_GMAIL_XOAUTH2
+         const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
+         qCDebug(IMAPRESOURCE_LOG) << "serverTest null";
+         m_ui->noRadio->setEnabled(!isGmail);
+@@ -606,9 +606,9 @@ void SetupServer::slotSafetyChanged()
+         m_ui->tlsRadio->setEnabled(!isGmail);
+ 
+         m_ui->authenticationCombo->setEnabled(!isGmail);
++#endif
+         return;
+     }
+-#endif
+     QVector<int> protocols;
+ 
+     switch (m_ui->safeImapGroup->checkedId()) {
+-- 
+cgit v0.11.2
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
new file mode 100644
index 000000000000..0bc02e395f6d
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="google"
+
+# TODO kolab, Qt5TextToSpeech
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdav)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	google? ( $(add_kdeapps_dep libkgapi) )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libxslt
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-imap-resource-crash.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google KPimGAPI)
+	)
+
+	kde5_src_configure
+}