unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: 27318@debbugs.gnu.org
Subject: bug#27318: [PATCH 1/2] gnu: stellarium: Fix build with Qt 5.9.
Date: Sun, 11 Jun 2017 00:23:17 +0200	[thread overview]
Message-ID: <20170610222318.12878-2-dannym@scratchpost.org> (raw)
In-Reply-To: <20170610222318.12878-1-dannym@scratchpost.org>

* 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 2aa65d588..6c486469d 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	other threads:[~2017-06-10 22:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-10 22:23 bug#27317: [PATCH 0/2] Make stellarium work again Danny Milosavljevic
2017-06-10 22:23 ` Danny Milosavljevic [this message]
2017-06-11 17:28   ` bug#27318: [PATCH 1/2] gnu: stellarium: Fix build with Qt 5.9 Kei Kebreau
2017-06-10 22:23 ` bug#27319: [PATCH 2/2] gnu: stellarium: Update to 0.15.2 Danny Milosavljevic
2017-06-11 17:28   ` Kei Kebreau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170610222318.12878-2-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=27318@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).