unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29997] [PATCH] gnu: stellarium: Update to 0.17.0.
@ 2018-01-05 21:01 Kei Kebreau
  2018-01-05 21:12 ` Leo Famulari
  0 siblings, 1 reply; 3+ messages in thread
From: Kei Kebreau @ 2018-01-05 21:01 UTC (permalink / raw)
  To: 29997; +Cc: Kei Kebreau

* gnu/packages/astronomy.scm (stellarium): Update to 0.17.0.
[source]: Use new upstream URL.
[arguments]: Adjust #:test-target; add #:configure-flags to locate the
qtserialport header files and enable the building of tests.; remove
'patch-tests' phase.
---
 gnu/packages/astronomy.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index d21c09387..61197ccea 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -117,15 +117,16 @@ programs for the manipulation and analysis of astronomical data.")
 (define-public stellarium
   (package
     (name "stellarium")
-    (version "0.16.0")
+    (version "0.17.0")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://sourceforge/stellarium/"
-                                 "Stellarium-sources/"
-                                 version "/stellarium-" version ".tar.gz"))
+             (uri (string-append "https://github.com/Stellarium/" name
+                                 "/releases/download/v" version
+                                 "/" name "-" version ".tar.gz"))
+             (file-name (string-append name "-" version ".tar.gz"))
              (sha256
               (base32
-               "1krxj51lix096xbz64lys166a8zdwhill5vvs7dlxdn14amc8d98"))))
+               "0d6b3fs5aify7i1lwgkcickppnj73cbh24g8qschnfs3ypdf48fc"))))
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase)
@@ -140,19 +141,19 @@ programs for the manipulation and analysis of astronomical data.")
        ("qtbase" ,qtbase) ; Qt MOC is needed at compile time
        ("qttools" ,qttools)))
     (arguments
-      `(#:test-target "tests"
-        #:phases (modify-phases %standard-phases
-                   (add-after 'unpack 'patch-tests
-                     (lambda _
-                       (substitute* "src/tests/testStelSphereGeometry.cpp"
-                         (("Vec3d v[(]0[)]") "Vec3d v(0.0)"))
-                       #t))
-                   (add-before 'check 'set-offscreen-display
-                     (lambda _
-                       ;; make Qt render "offscreen", required for tests
-                       (setenv "QT_QPA_PLATFORM" "offscreen")
-                       (setenv "HOME" "/tmp")
-                       #t)))))
+     `(#:test-target "test"
+       #:configure-flags (list "-DENABLE_TESTING=1"
+                               (string-append
+                                "-DCMAKE_CXX_FLAGS=-isystem "
+                                (assoc-ref %build-inputs "qtserialport")
+                                "/include/qt5"))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'check 'set-offscreen-display
+                    (lambda _
+                      ;; make Qt render "offscreen", required for tests
+                      (setenv "QT_QPA_PLATFORM" "offscreen")
+                      (setenv "HOME" "/tmp")
+                      #t)))))
     (home-page "http://www.stellarium.org/")
     (synopsis "3D sky viewer")
     (description "Stellarium is a planetarium.  It shows a realistic sky in
-- 
2.15.1

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

* [bug#29997] [PATCH] gnu: stellarium: Update to 0.17.0.
  2018-01-05 21:01 [bug#29997] [PATCH] gnu: stellarium: Update to 0.17.0 Kei Kebreau
@ 2018-01-05 21:12 ` Leo Famulari
  2018-01-06  2:35   ` bug#29997: " Kei Kebreau
  0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2018-01-05 21:12 UTC (permalink / raw)
  To: Kei Kebreau; +Cc: 29997

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

On Fri, Jan 05, 2018 at 04:01:47PM -0500, Kei Kebreau wrote:
> * gnu/packages/astronomy.scm (stellarium): Update to 0.17.0.
> [source]: Use new upstream URL.
> [arguments]: Adjust #:test-target; add #:configure-flags to locate the
> qtserialport header files and enable the building of tests.; remove
> 'patch-tests' phase.
                                                             ^
Typo here? --------------------------------------------------|

Otherwise LGTM, thanks!

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

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

* bug#29997: [PATCH] gnu: stellarium: Update to 0.17.0.
  2018-01-05 21:12 ` Leo Famulari
@ 2018-01-06  2:35   ` Kei Kebreau
  0 siblings, 0 replies; 3+ messages in thread
From: Kei Kebreau @ 2018-01-06  2:35 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 29997-done

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Fri, Jan 05, 2018 at 04:01:47PM -0500, Kei Kebreau wrote:
>> * gnu/packages/astronomy.scm (stellarium): Update to 0.17.0.
>> [source]: Use new upstream URL.
>> [arguments]: Adjust #:test-target; add #:configure-flags to locate the
>> qtserialport header files and enable the building of tests.; remove
>> 'patch-tests' phase.
>                                                              ^
> Typo here? --------------------------------------------------|

Indeed! I've pushed this without the typo.

>
> Otherwise LGTM, thanks!

Thanks for reviewing!

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

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

end of thread, other threads:[~2018-01-06  2:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-05 21:01 [bug#29997] [PATCH] gnu: stellarium: Update to 0.17.0 Kei Kebreau
2018-01-05 21:12 ` Leo Famulari
2018-01-06  2:35   ` bug#29997: " Kei Kebreau

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).