From: Cairn via Guix-patches via <guix-patches@gnu.org>
To: "58481@debbugs.gnu.org" <58481@debbugs.gnu.org>
Subject: [bug#58481] [PATCH 9/9] gnu: stellarium: Update to 1.0.
Date: Thu, 13 Oct 2022 05:43:12 +0000 [thread overview]
Message-ID: <9Ur0xxihNkidL-6S43Jm9z1DAfHbwsPs1kHSQPfHktINUEbnY7fJ6DwXNjqdG19bRXa1fNqLx93RxD4xmAFkwOUxTkx251DCVooi2Ci8H9I=@pm.me> (raw)
In-Reply-To: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me>
[-- Attachment #1.1: Type: text/plain, Size: 4889 bytes --]
* gnu/packages/astronomy.scm (stellarium): Update to 1.0.
---
gnu/packages/astronomy.scm | 80 +++++++++++++++++++++++---------------
1 file changed, 49 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 72e923e895..5798d8004f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -43,6 +43,8 @@ (define-module (gnu packages astronomy)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gps)
+ #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libusb)
@@ -66,6 +68,7 @@ (define-module (gnu packages astronomy)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages wxwidgets)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -74,6 +77,7 @@ (define-module (gnu packages astronomy)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (guix build utils)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
@@ -759,42 +763,56 @@ (define-public calcmysky
(define-public stellarium
(package
(name "stellarium")
- (version "0.21.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/Stellarium/stellarium"
- "/releases/download/v" version
- "/stellarium-" version ".tar.gz"))
- (sha256
- (base32 "049jlc8vx06pad5h2syrmf7f1l346yr5iraai0wkn8s8pk30j8q7"))))
+ (version "1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Stellarium/stellarium"
+ "/releases/download/v" version
+ "/stellarium-" version ".tar.gz"))
+ (sha256
+ (base32 "0gzksnskk0a105dji5j7hjizmyc7bs9riz6650hv417bq70i46as"))))
(build-system cmake-build-system)
(inputs
- (list qtbase-5
- qtlocation
- qtmultimedia-5
- qtscript
- qtserialport-5
+ (list qtbase
+ qtmultimedia
+ qtpositioning
+ qttools
+ qtimageformats
+ qtwebengine
+ qtwebchannel
+ qtcharts
+ qtserialport
+ qtdeclarative
+ libxkbcommon
+ calcmysky
+ qxlsx
+ indi
+ libnova
+ gpsd
zlib))
(native-inputs
- `(("gettext" ,gettext-minimal) ; xgettext is used at compile time
- ("perl" ,perl) ; for pod2man
- ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time
- ("qttools-5" ,qttools-5)))
+ (list gettext-minimal ; xgettext is used at compile time
+ perl ; for pod2man
+ qtbase ; Qt MOC is needed at compile time
+ graphviz
+ doxygen
+ qttools))
(arguments
- `(#:test-target "test"
- #:configure-flags (list "-DENABLE_TESTING=1"
- (string-append
- "-DCMAKE_CXX_FLAGS=-isystem "
- (assoc-ref %build-inputs "qtserialport-5")
- "/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)))))
+ (list #:test-target "test"
+ #:configure-flags
+ #~(list "-DENABLE_TESTING=1"
+ "-DENABLE_QT6=1"
+ (string-append
+ "-DCMAKE_CXX_FLAGS=-isystem "
+ #$(this-package-input "qtserialport")
+ "/include/qt6"))
+ #: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"))))))
(home-page "https://stellarium.org/")
(synopsis "3D sky viewer")
(description "Stellarium is a planetarium. It shows a realistic sky in
--
2.38.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 855 bytes --]
next prev parent reply other threads:[~2022-10-13 5:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 5:19 [bug#58481] [WIP PATCH 0/9] gnu: stellarium: Update to 1.0 Cairn via Guix-patches via
2022-10-13 5:24 ` [bug#58481] Stellarium build log Cairn via Guix-patches via
2022-10-13 5:35 ` [bug#58481] [PATCH 1/9] gnu: qtcharts: Rename variable to qtcharts-5 Cairn via Guix-patches via
2022-10-13 5:37 ` [bug#58481] [PATCH 2/9] gnu: Add qtcharts, version 6.3.1 Cairn via Guix-patches via
2022-10-13 5:38 ` [bug#58481] [PATCH 3/9] gnu: qtserialport: Rename variable to qtserialport-5 Cairn via Guix-patches via
2022-10-13 5:39 ` [bug#58481] [PATCH 4/9] gnu: Add qtserialport, version 6.3.1 Cairn via Guix-patches via
2022-10-13 5:39 ` [bug#58481] [PATCH 5/9] gnu: qtimageformats: Rename variable to qtimageformats-5 Cairn via Guix-patches via
2022-10-13 5:41 ` [bug#58481] [PATCH 6/9] gnu: Add qtimageformats, version 6.3.1 Cairn via Guix-patches via
2022-10-13 5:42 ` [bug#58481] [PATCH 7/9] gnu: Add qxlsx Cairn via Guix-patches via
2022-10-13 5:42 ` [bug#58481] [PATCH 8/9] gnu: Add calcmysky Cairn via Guix-patches via
2022-10-13 5:43 ` Cairn via Guix-patches via [this message]
2023-05-03 8:24 ` [bug#58481] Sharlatan Hellseher
2024-02-08 18:27 ` bug#58481: [WIP PATCH 0/9] gnu: stellarium: Update to 1.0 Sharlatan Hellseher
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='9Ur0xxihNkidL-6S43Jm9z1DAfHbwsPs1kHSQPfHktINUEbnY7fJ6DwXNjqdG19bRXa1fNqLx93RxD4xmAFkwOUxTkx251DCVooi2Ci8H9I=@pm.me' \
--to=guix-patches@gnu.org \
--cc=58481@debbugs.gnu.org \
--cc=cairn@pm.me \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.