Merge ~wxl/kubuntu-packaging/+git/kdepim-runtime:kubuntu_bionic_archive into ~kubuntu-packagers/kubuntu-packaging/+git/kdepim-runtime:kubuntu_bionic_archive

[Walter Lapchynski]

Add upstream find_resource_interface_when_running_test_environment patch.

[Simon Quigley (tsimonq2)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 1a2be7a..75ef37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdepim-runtime (4:17.08.3-0ubuntu2) bionic; urgency=medium
+
+  * Add upstream find_resource_interface_when_running_test_environment patch.
+
+ -- Walter Lapchynski <[e-mail]>  Thu, 07 Dec 2017 01:50:06 +0000
+
 kdepim-runtime (4:17.08.3-0ubuntu1) bionic; urgency=medium
 
   * New build depend on libkf5contacteditor-dev
diff --git a/debian/patches/find_resource_interface_when_running_test_environment.diff b/debian/patches/find_resource_interface_when_running_test_environment.diff
new file mode 100644
index 0000000..faaf150
--- /dev/null
+++ b/debian/patches/find_resource_interface_when_running_test_environment.diff
@@ -0,0 +1,42 @@
+Description: Fix finding resource interface when running the test environment
+Origin: upstream, https://github.com/KDE/kdepim-runtime/commit/8b7e7bfd2e9751e6bd7f4a292c42dc5468dacf0a?diff=unified
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/resources/maildir/autotests/synctest.cpp
+===================================================================
+--- a/resources/maildir/autotests/synctest.cpp
++++ b/resources/maildir/autotests/synctest.cpp
+@@ -47,7 +47,12 @@ void SyncTest::initTestCase()
+     QVERIFY(agentCreateJob->exec());
+     mMaildirIdentifier = agentCreateJob->instance().identifier();
+ 
+-    OrgKdeAkonadiMaildirSettingsInterface interface(QStringLiteral("org.freedesktop.Akonadi.Resource.%1").arg(mMaildirIdentifier), QStringLiteral("/"), QDBusConnection::sessionBus());
++    QString service = QStringLiteral("org.freedesktop.Akonadi.Resource.") + mMaildirIdentifier;
++    if (Akonadi::ServerManager::hasInstanceIdentifier()) {
++        service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier();
++    }
++
++    OrgKdeAkonadiMaildirSettingsInterface interface(service, QStringLiteral("/"), QDBusConnection::sessionBus());
+     QVERIFY(interface.isValid());
+     const QString mailPath = QFINDTESTDATA("maildir");
+     QVERIFY(!mailPath.isEmpty());
+Index: b/resources/pop3/autotests/pop3test.cpp
+===================================================================
+--- a/resources/pop3/autotests/pop3test.cpp
++++ b/resources/pop3/autotests/pop3test.cpp
+@@ -71,8 +71,14 @@ void Pop3Test::initTestCase()
+     //
+     QString maildirRootPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QLatin1String("tester");
+     mMaildirPath = maildirRootPath + QLatin1String("/new");
++
++    QString service = QLatin1String("org.freedesktop.Akonadi.Resource.") + mMaildirIdentifier;
++    if (Akonadi::ServerManager::hasInstanceIdentifier()) {
++        service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier();
++    }
++
+     mMaildirSettingsInterface = new OrgKdeAkonadiMaildirSettingsInterface(
+-        QLatin1String("org.freedesktop.Akonadi.Resource.") + mMaildirIdentifier,
++        service,
+         QStringLiteral("/Settings"), QDBusConnection::sessionBus(), this);
+     QDBusReply<void> setPathReply = mMaildirSettingsInterface->setPath(maildirRootPath);
+     QVERIFY(setPathReply.isValid());
diff --git a/debian/patches/series b/debian/patches/series
index 138e65a..1e4a5a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kubuntu_disable_failing_tests.diff
+find_resource_interface_when_running_test_environment.diff