GNU bug report logs - #42626
[PATCH] gnu: qtimageformats: fix build.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: qtimageformats: fix build.
Date: Fri, 31 Jul 2020 10:15:08 +0200

[Message part 1 (text/plain, inline)]

nefix reported on IRC that qtimageformats doesnt build.

[0001-gnu-qtimageformats-fix-build.patch (text/x-patch, inline)]

From 3c74b590d6578bc5a6f9ac84cc8e0339ffee9175 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike <at> 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 <at> posteo.net>
 ;;; Copyright © 2020 TomZ <tomz <at> freedommail.ch>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
+;;; Copyright © 2020 Michael Rohleder <mike <at> 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

[Message part 3 (text/plain, inline)]

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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.