Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2018-07-07 21:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Sat Jul 7 21:56:42 2018 rev:38 rq:620206 version:18.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2018-06-13 15:21:40.767668414 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2018-07-07 21:57:14.827405272 +0200 @@ -1,0 +2,6 @@ +Mon Jul 2 09:46:18 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix EWS connection when server needs an empty domain, fix kde#388496, backport: + Add 0001-Always-add-domain-delimiter-if-Domain-checkbox-is-se.patch + +------------------------------------------------------------------- New: ---- 0001-Always-add-domain-delimiter-if-Domain-checkbox-is-se.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.vHkpMt/_old 2018-07-07 21:57:15.547404359 +0200 +++ /var/tmp/diff_new_pack.vHkpMt/_new 2018-07-07 21:57:15.547404359 +0200 @@ -29,6 +29,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kdepim-runtime-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Always-add-domain-delimiter-if-Domain-checkbox-is-se.patch BuildRequires: akonadi-calendar-devel >= %{_kapp_version} BuildRequires: akonadi-contact-devel >= %{_kapp_version} BuildRequires: akonadi-mime-devel >= %{_kapp_version} @@ -108,6 +110,7 @@ %prep %setup -q -n kdepim-runtime-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ 0001-Always-add-domain-delimiter-if-Domain-checkbox-is-se.patch ++++++ >From 0a89c7edf973091804ccf609e9c8f68f8cee9aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Wed, 3 Jan 2018 17:15:27 +0100 Subject: [PATCH] Always add domain delimiter if "Domain" checkbox is selected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ConfigDialog::fullUsername() always adds the domain delimiter, even if the actual domain name is empty. Not doing so results in failing authentication for some(?) servers. Signed-off-by: Stefan Brüns <stefan.bru...@rwth-aachen.de> --- resources/ews/ewsresource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ews/ewsresource.cpp b/resources/ews/ewsresource.cpp index c67228a..a2c714b 100644 --- a/resources/ews/ewsresource.cpp +++ b/resources/ews/ewsresource.cpp @@ -451,7 +451,7 @@ void EwsResource::passwordRequestFinished(const QString &password) setOnline(false); Q_EMIT status(NotConfigured, i18nc("@info:status", "No password configured.")); } else { - if (mSettings->domain().isEmpty()) { + if (!mSettings->hasDomain()) { mEwsClient.setCredentials(mSettings->username(), mPassword); } else { mEwsClient.setCredentials(mSettings->domain() + QLatin1Char('\\') + mSettings->username(), mPassword); -- 2.15.1
