From 6f5c67d7250913bde52f47904fda08325a9334a3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 3 Jun 2018 12:46:01 +0300
Subject: gnu: keepassxc: Fix compilation with Qt 5.11.

* gnu/packages/password-utils.scm (keepassxc)[arguments]: Add custom
'patch-sources phase to include missing headers.
---
 gnu/packages/password-utils.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 011cf594d1..497963af63 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Steve Sprang <scs@stevesprang.com>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Aljosha Papsch <misc@rpapsch.de>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Jessica Tallon <tsyesika@tsyesika.se>
@@ -110,7 +110,17 @@ human.")
     (arguments
      '(#:configure-flags '("-DWITH_XC_NETWORKING=YES"
                            "-DWITH_XC_BROWSER=YES"
-                           "-DWITH_XC_SSHAGENT=YES")))
+                           "-DWITH_XC_SSHAGENT=YES")
+       #:phases
+       (modify-phases %standard-phases
+         ;; should be fixed in 2.3.3+, see:
+         ;; https://github.com/keepassxreboot/keepassxc/pull/1964
+         (add-after 'unpack 'patch-sources
+           (lambda _
+             (substitute* "src/gui/entry/EditEntryWidget.cpp"
+               (("#include <QColorDialog>") "#include <QColorDialog>
+#include <QButtonGroup>"))
+             #t)))))
     (inputs
      `(("argon2" ,argon2)
        ("curl" ,curl) ; XC_NETWORKING
-- 
cgit v1.2.3

ep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d5c88f16c45ed9e9404a30d1dc8b4183aee9e6bb'>root</a>/<a href='/guix/log/etc?id=d5c88f16c45ed9e9404a30d1dc8b4183aee9e6bb'>etc</a>/<a href='/guix/log/etc/guix-publish.conf.in?id=d5c88f16c45ed9e9404a30d1dc8b4183aee9e6bb'>guix-publish.conf.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-publish.conf.in?id=d5c88f16c45ed9e9404a30d1dc8b4183aee9e6bb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-03-06 13:25:51 -0500'>2017-03-06</span></td><td><a href='/guix/commit/etc/guix-publish.conf.in?id=613d0895b92c677e0639d5e77c55043e38e020c8'>build: Don't embed absolute paths in .service and .conf service files.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2016-11-24 09:23:11 +0100'>2016-11-24</span></td><td><a href='/guix/commit/etc/guix-publish.conf.in?id=332d7903f52c2bf3741b04ac2d01cd9018b70800'>Add system start-up files for "guix publish".</a><span class='msg-avail'>...</span></td><td>Hartmut Goebel</td></tr>