guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: stellarium: Fix build with Qt 5.9.


From: Danny Milosavljevic
Subject: 01/02: gnu: stellarium: Fix build with Qt 5.9.
Date: Mon, 12 Jun 2017 01:33:46 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit 2606fd6fc9aa725b8ad22294806630b405a6c9bb
Author: Danny Milosavljevic <address@hidden>
Date:   Sun Jun 11 00:23:17 2017 +0200

    gnu: stellarium: Fix build with Qt 5.9.
    
    * gnu/packages/astronomy.scm (stellarium)[arguments]:
    Add phase "patch-version-check".
---
 gnu/packages/astronomy.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 2aa65d5..6c48646 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -141,6 +141,14 @@ programs for the manipulation and analysis of astronomical 
data.")
     (arguments
       `(#:test-target "tests"
         #:phases (modify-phases %standard-phases
+                   (add-after 'unpack 'patch-version-check
+                     (lambda _
+                       ;; Previously-deprecated cmake variable vanished in
+                       ;; Qt 5.9.
+                       ;; See <https://bugreports.qt.io/browse/QTBUG-60936>.
+                       (substitute* "CMakeLists.txt"
+                         (("Qt5Core_VERSION_STRING") "Qt5Core_VERSION"))
+                       #t))
                    (add-before 'check 'set-offscreen-display
                      (lambda _
                        ;; make Qt render "offscreen", required for tests



reply via email to

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