gnu: KDE: Update to 20.04.1.

* gnu/packages/patches/akonadi-paths.patch: Adjust for upstream changes.
* gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/kde-internet.scm (kget, kopete, krdc, libgravatar): Update to
20.04.1.
[source](uri): Adjust for new upstream location.
* gnu/packages/kde-multimedia.scm (audiocd-kio, dragon, ffmpegthumbs, juk,
k3b, kamoso, kmix, kwave, libkcddb, libkcompactdisc): Likewise.
* gnu/packages/kde-systemtools.scm (dolphin, dolphin-plugins, khelpcenter,
konsole, krfb, ksystemlog): Update to 20.04.1.
[source](uri): Adjust for new upstream location.
* gnu/packages/kde-utils.scm (kate, kmag, kmousetool, kmouth, sweeper): Update
to 20.04.1.
[source](uri): Adjust for new upstream location.
* gnu/packages/kde.scm (baloo-widgets, libkomparediff2, kqtquickcharts,
grantleetheme, kcachegrind, libkdegames, zeroconf-ioslave): Update to 20.04.1.
[source](uri): Adjust for new upstream location.
(grantleetheme)[inputs]: Add KGUIADDONS.
* gnu/packages/kde-pim.scm (akonadi, akonadi-calendar, akonadi-contacts,
akonadi-mime, akonadi-notes, akonadi-search, kincidenceeditor, kaddressbook,
kalarmcal, kblog, kcalendarsupport, kcalutils, kdav, kdepim-apps-libs,
kdepim-runtime, keventviews, kgpg, kidentitymanagement, kimap, kldap,
kleopatra, kmail, kmailcommon, kmailimporter, kmailtransport, kmbox,
kmessagelib, kmime, knotes, kontactinterface, korganizer, kpimcommon,
kpimtextedit, ksmtp, ktnef, libkdepim, libkgapi, libkleo, libksieve): Update
to 20.04.1.
[source](uri): Adjust to current.
(akonadi)[inputs]: Remove KDBUSADDONS and KDESIGNERPLUGIN.
(akonadi-calendar)[inputs]: Remove KDBUSADDONS.
(kdepim-runtime)[source](patches): Remove.
[arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH'.
[inputs]: Remove KDBUSADDONS and KICONTHEMES.
(kmessagelib)[arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH.
[inputs]: Add QCA.
(kdepim-apps-libs)[inputs]: Remove KDBUSADDONS and KICONTHEMES.
(knotes)[inputs]: Remove KDBUSADDONS.
(kpimcommon)[inputs]: Remove KDBUSADDONS and KCOMPLETION.
(libksieve)[arguments]: Disable one more test.
(korganizer)[arguments]: Disable one test.

2 files changed, 26 insertions, 69 deletions

diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch
index da250ee9e8..ac08ec5448 100644
--- a/gnu/packages/patches/akonadi-paths.patch
+++ b/gnu/packages/patches/akonadi-paths.patch
@@ -1,31 +1,31 @@
 This is based on the respectve patch from NixPkgs, but with the parts pinning
 mysql and postgresql executables removed. The our package definition on why.
 
-
-Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp
-+++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
-@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
-     mStorageController = new Akonadi::ProcessControl;
-     mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
-     connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
--    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+    mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
+--- a/src/akonadicontrol/agentmanager.cpp
++++ b/src/akonadicontrol/agentmanager.cpp
+@@ -61,7 +61,7 @@ public:
+                 []() {
+                     QCoreApplication::instance()->exit(255);
+                 });
+-        start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
++        start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
+     }
  
-     if (mAgentServerEnabled) {
-         mAgentServer = new Akonadi::ProcessControl;
-         connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
--        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+     ~StorageProcessControl() override
+@@ -84,7 +84,7 @@ public:
+                 []() {
+                     qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
+                 });
+-        start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
++        start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
      }
- }
  
-Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp
-+++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
+     ~AgentServerProcessControl() override
+diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
+--- a/src/akonadicontrol/agentprocessinstance.cpp
++++ b/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
      } else {
          Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
          const QStringList arguments = QStringList() << executable << identifier();
@@ -34,11 +34,10 @@ Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
          mController->start(agentLauncherExec, arguments);
      }
      return true;
-Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
-===================================================================
---- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
-+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
-@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer(
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -209,7 +209,7 @@ bool DbConfigMysql::startInternalServer()
  #endif
  
      // generate config file
diff --git a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch
deleted file mode 100644
index 13345c0038..0000000000
--- a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b84c4ba97cecf7304e99cafdd8a9c5866ce27050 Mon Sep 17 00:00:00 2001
-From: Hartmut Goebel <h.goebel@crazy-compilers.com>
-Date: Tue, 21 Jan 2020 23:33:50 +0100
-Subject: [PATCH] Fix missing link libraries.
-
-See <https://phabricator.kde.org/D26819>
-
-These are only actually missing if the libraries reside in different
-prefixes, as it is the case in Guix or Nix.
----
- resources/ews/test/CMakeLists.txt | 1 +
- resources/facebook/CMakeLists.txt | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/resources/ews/test/CMakeLists.txt b/resources/ews/test/CMakeLists.txt
-index b20eddcb8..6355eb994 100644
---- a/resources/ews/test/CMakeLists.txt
-+++ b/resources/ews/test/CMakeLists.txt
-@@ -35,6 +35,7 @@ qt5_add_resources(isolatestestcommon_RSRCS isolatedtestcommon.qrc)
- add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS})
- target_link_libraries(isolatedtestcommon
-   KF5::AkonadiCore
-+  KF5::AkonadiMime
-   Qt5::Core
-   Qt5::Network
-   Qt5::Test
-diff --git a/resources/facebook/CMakeLists.txt b/resources/facebook/CMakeLists.txt
-index bdd5eeaa7..27a9c83c1 100644
---- a/resources/facebook/CMakeLists.txt
-+++ b/resources/facebook/CMakeLists.txt
-@@ -21,7 +21,8 @@ add_library(facebookresourcelib STATIC ${fbresource_SRCS})
- 
- target_link_libraries(facebookresourcelib
-     KF5::KIOWidgets
-+    KF5::AkonadiCore
-     KF5::IconThemes
-     KF5::I18n
-     KF5::ConfigGui
-     KF5::CalendarCore
--- 
-2.21.1
-