[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: qtimageformats: Fix build.
From: |
guix-commits |
Subject: |
02/07: gnu: qtimageformats: Fix build. |
Date: |
Sat, 1 Aug 2020 03:32:07 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit a0a55309a7aaffecb1dcfadc5daba5e7c7d896e1
Author: Michael Rohleder <mike@rohleder.de>
AuthorDate: Fri Jul 31 10:15:08 2020 +0200
gnu: qtimageformats: Fix build.
Reported by <nefix> on IRC.
* gnu/packages/qt.scm (qtimageformats)[arguments]: Add a 'fix-build phase.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/qt.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4b3af75..17a2ad1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020 TomZ <tomz@freedommail.ch>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -712,6 +713,16 @@ HostData=lib/qt5
'(begin
(delete-file-recursively "src/3rdparty")
#t))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
+ (("^#include <jasper/jasper.h>")
+ "#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
+ #t))))))
(native-inputs `())
(inputs
`(("jasper" ,jasper)
- branch master updated (c7fe7f2 -> 3cc8b4f), guix-commits, 2020/08/01
- 03/07: gnu: Add python-pytest-ordering., guix-commits, 2020/08/01
- 01/07: guix: lint: Ignore unsupported source URL’s., guix-commits, 2020/08/01
- 02/07: gnu: qtimageformats: Fix build.,
guix-commits <=
- 04/07: gnu: Update xxhash to 0.8.0., guix-commits, 2020/08/01
- 05/07: gnu: plantuml: Update to 1.2020.15., guix-commits, 2020/08/01
- 06/07: gnu: xfce4-notifyd: Update to 0.6.1., guix-commits, 2020/08/01
- 07/07: gnu: pulsemixer: Update to 1.5.1., guix-commits, 2020/08/01