unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#42626] [PATCH] gnu: qtimageformats: fix build.
@ 2020-07-31  8:15 Michael Rohleder
  2020-08-01  6:49 ` bug#42626: " Mathieu Othacehe
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Rohleder @ 2020-07-31  8:15 UTC (permalink / raw)
  To: 42626


[-- Attachment #1.1: Type: text/plain, Size: 57 bytes --]

nefix reported on IRC that qtimageformats doesnt build.


[-- Attachment #1.2: [PATCH] gnu: qtimageformats: fix build. --]
[-- Type: text/x-patch, Size: 1469 bytes --]

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


[-- Attachment #1.3: Type: text/plain, Size: 73 bytes --]


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#42626: [PATCH] gnu: qtimageformats: fix build.
  2020-07-31  8:15 [bug#42626] [PATCH] gnu: qtimageformats: fix build Michael Rohleder
@ 2020-08-01  6:49 ` Mathieu Othacehe
  0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2020-08-01  6:49 UTC (permalink / raw)
  To: Michael Rohleder; +Cc: 42626-done


> * gnu/packages/qt.scm (qtimageformats): fix build.

Pushed, thanks!

Mathieu




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-08-01  6:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-31  8:15 [bug#42626] [PATCH] gnu: qtimageformats: fix build Michael Rohleder
2020-08-01  6:49 ` bug#42626: " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).