diff options
author | Leo Famulari <leo@famulari.name> | 2017-06-29 18:02:17 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-06-29 18:02:17 -0400 |
commit | 1024c8119c71ba3ec0122238e8d8254b08d29187 (patch) | |
tree | ad12a1aac7f828791154a1786d4f245db71b46e9 /gnu/packages/astronomy.scm | |
parent | 92cb946bd9d78cb8f6aa8418d505f52da6894ab4 (diff) | |
parent | 95bbaa02aa63bc5eae36f686f1ed9915663aa4cf (diff) | |
download | patches-1024c8119c71ba3ec0122238e8d8254b08d29187.tar patches-1024c8119c71ba3ec0122238e8d8254b08d29187.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/astronomy.scm')
-rw-r--r-- | gnu/packages/astronomy.scm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f5509dab10..132013b57a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -121,7 +121,7 @@ programs for the manipulation and analysis of astronomical data.") (define-public stellarium (package (name "stellarium") - (version "0.15.2") + (version "0.16.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/stellarium/" @@ -129,10 +129,11 @@ programs for the manipulation and analysis of astronomical data.") version "/stellarium-" version ".tar.gz")) (sha256 (base32 - "19nxj482g1hh9qicgskpcgy61pri254jgxnkd10icxbnza4c0hv9")))) + "1krxj51lix096xbz64lys166a8zdwhill5vvs7dlxdn14amc8d98")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) + ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) ("qtserialport" ,qtserialport) @@ -145,13 +146,10 @@ programs for the manipulation and analysis of astronomical data.") (arguments `(#:test-target "tests" #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-version-check + (add-after 'unpack 'patch-tests (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")) + (substitute* "src/tests/testStelSphereGeometry.cpp" + (("Vec3d v[(]0[)]") "Vec3d v(0.0)")) #t)) (add-before 'check 'set-offscreen-display (lambda _ |