guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#42626] [PATCH] gnu: qtimageformats: fix build.


From: Michael Rohleder
Subject: [bug#42626] [PATCH] gnu: qtimageformats: fix build.
Date: Fri, 31 Jul 2020 10:15:08 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)

nefix reported on IRC that qtimageformats doesnt build.

From 3c74b590d6578bc5a6f9ac84cc8e0339ffee9175 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Fri, 31 Jul 2020 10:11:49 +0200
Subject: [PATCH] gnu: qtimageformats: fix build.

* gnu/packages/qt.scm (qtimageformats): fix build.
---
 gnu/packages/qt.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4b3af757f9..053f744037 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,15 @@ 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)
-- 
2.28.0

-- 
some people are so poor that the only
thing they have is money.

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]