From 766c8f106e8b487a095f682318f84254051c8e2d Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 13 Aug 2019 21:21:08 +0200
Subject: [PATCH] kmail: add patch "fix build by including QMap"

---
 pkgs/applications/kde/kmail.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index a58b3b8c45d..b08444f18bb 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  mkDerivation, lib, kdepimTeam, fetchpatch,
   extra-cmake-modules, kdoctools,
   akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
   kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
@@ -26,5 +26,13 @@ mkDerivation {
     libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
   ];
   propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
-  patches = [ ./kmail.patch ];
+  patches = [
+    ./kmail.patch
+
+    # This patch should be backported in 19.04.4 KDE applications
+    (fetchpatch {
+      url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a";
+      sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n";
+    })
+  ];
 }