Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2017-06-01 16:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Thu Jun 1 16:23:43 2017 rev:24 rq:497337 version:17.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2017-05-22 10:40:13.570302206 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2017-06-01 16:24:24.269597271 +0200 @@ -1,0 +2,8 @@ +Mon May 22 12:32:34 UTC 2017 - wba...@tmo.at + +- Add add-missing-include.patch and + fix-crash-when-configuring-IMAP-resources.patch to fix IMAP + resources crashing when trying to open settings + (kde#379155, boo#1040086) + +------------------------------------------------------------------- New: ---- add-missing-include.patch fix-crash-when-configuring-IMAP-resources.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.KZpsYe/_old 2017-06-01 16:24:24.785524521 +0200 +++ /var/tmp/diff_new_pack.KZpsYe/_new 2017-06-01 16:24:24.789523957 +0200 @@ -29,6 +29,9 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kdepim-runtime-%{version}.tar.xz +#PATCH-FIX-UPSTREAM +Patch0: add-missing-include.patch +Patch1: fix-crash-when-configuring-IMAP-resources.patch BuildRequires: akonadi-calendar-devel >= %{_kapp_version} BuildRequires: akonadi-contact-devel >= %{_kapp_version} BuildRequires: akonadi-mime-devel >= %{_kapp_version} @@ -91,6 +94,8 @@ %prep %setup -q -n kdepim-runtime-%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ add-missing-include.patch ++++++ >From e8b131fe179f474af9de12f1289ea70cd99e90e4 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <aro...@archlinux.org> Date: Fri, 12 May 2017 16:56:40 +0200 Subject: Add missing include Otherwise WITH_GMAIL_XOAUTH2 is always undefined BUG: 379155 Differential Revision: https://phabricator.kde.org/D5819 --- resources/imap/setupserver.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp index 12a37ae..afaa678 100644 --- a/resources/imap/setupserver.cpp +++ b/resources/imap/setupserver.cpp @@ -34,6 +34,7 @@ #include "serverinfodialog.h" #include "folderarchivesettingpage.h" #include "utils.h" +#include "config.h" #include <mailtransport/transport.h> #include <mailtransport/servertest.h> -- cgit v0.11.2 ++++++ fix-crash-when-configuring-IMAP-resources.patch ++++++ >From 611510d0a005bc93102aa4b9f1a5b5f9905c4179 Mon Sep 17 00:00:00 2001 From: Montel Laurent <mon...@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
