From patchwork Thu Oct 13 05:43:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43362 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4140827BBEA; Thu, 13 Oct 2022 06:44:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A0E0027BBE9 for ; Thu, 13 Oct 2022 06:44:26 +0100 (BST) Received: from localhost ([::1]:35526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir17-0008Tc-QU for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oir0l-0008Pf-2G for guix-patches@gnu.org; Thu, 13 Oct 2022 01:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oir0k-0004n8-Lr for guix-patches@gnu.org; Thu, 13 Oct 2022 01:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oir0k-0008BT-HP for guix-patches@gnu.org; Thu, 13 Oct 2022 01:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 9/9] gnu: stellarium: Update to 1.0. References: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> In-Reply-To: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> Resent-From: Cairn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 05:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58481 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "58481@debbugs.gnu.org" <58481@debbugs.gnu.org> Received: via spool by 58481-submit@debbugs.gnu.org id=B58481.166563980731403 (code B ref 58481); Thu, 13 Oct 2022 05:44:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:43:27 +0000 Received: from localhost ([127.0.0.1]:59016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oir0B-0008AQ-9t for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:43:27 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:56463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oir09-0008AD-E6 for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:43:26 -0400 Date: Thu, 13 Oct 2022 05:43:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639799; x=1665898999; bh=WysX6o3arowvi20Zovj+kiSJBsjEaz8L3cgDHaEsrZc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=HT+kYFr7oyzXHNWUil8xUjLHgxttWfv3reVZrybCRMbG7SDu32AEdOlVbHTc4Fbsd VzVpN+W+BMz7TVmlUuSFo1DLFKhcuanD6NfoT9iF8vKllZepPAnndbWlOYbzMqyEv9 gKap9QKHO4s7BFbqrRcyf2luGX/b2iu5rLnRATfNXYYd1oM4hwl24KaXgsUxNNhQzf fVHrVmGsv2Ju59bEuha4czqJz2QO3vvXKBplvdmJgkCOy/ikH+8dzs72VHo3K2U3Sy BXS7gEn674nenW7AYHI5aeJmiOQv2B135t0th4u/NCbIL6yQct9znEXbVsr5RUqbxx peMVgAd2xpuyQ== Message-ID: <9Ur0xxihNkidL-6S43Jm9z1DAfHbwsPs1kHSQPfHktINUEbnY7fJ6DwXNjqdG19bRXa1fNqLx93RxD4xmAFkwOUxTkx251DCVooi2Ci8H9I=@pm.me> Feedback-ID: 6989168:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Cairn X-ACL-Warn: , Cairn via Guix-patches X-Patchwork-Original-From: Cairn via Guix-patches via From: Cairn X-getmail-retrieved-from-mailbox: Patches * 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