[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: keepassxc: Fix compilation with Qt 5.11.
From: |
Efraim Flashner |
Subject: |
01/01: gnu: keepassxc: Fix compilation with Qt 5.11. |
Date: |
Sun, 3 Jun 2018 05:46:32 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 6f5c67d7250913bde52f47904fda08325a9334a3
Author: Efraim Flashner <address@hidden>
Date: Sun Jun 3 12:46:01 2018 +0300
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 011cf59..497963a 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 <address@hidden>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Aljosha Papsch <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016 Jessica Tallon <address@hidden>
@@ -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