From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WMoDDLelR2Ne0QAAbAwnHQ (envelope-from ) for ; Thu, 13 Oct 2022 07:44:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KCM1DLelR2PmcwEAauVa8A (envelope-from ) for ; Thu, 13 Oct 2022 07:44:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CF56E1CFCF for ; Thu, 13 Oct 2022 07:44:22 +0200 (CEST) Received: from localhost ([::1]:35526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir13-0008Tc-R5 for larch@yhetil.org; Thu, 13 Oct 2022 01:44:21 -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 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha512; boundary="------3a1f9f68efc18772168effcd6dc9529b1f71ccec428d74d3108379e7e525202d"; charset=utf-8 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Cairn X-ACL-Warn: , Cairn via Guix-patches From: Cairn via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665639862; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=WysX6o3arowvi20Zovj+kiSJBsjEaz8L3cgDHaEsrZc=; b=fixs+jJ2e550wJGfQde9eMdVrmYCdvZJZNoLCew7M8ifT8rxgOW8dBrzPkZYDcRFxSrU82 SYzw7buF4/AhWjXaYlSN0kNHohgcGCNKUpYY6BsiQWk8q/nkOLRIvs7LKxLbs8XtNxveXy 84h7XD3nNDKs6/SYNRpxEL75vZchTd93bYpdQb6DSWHiYW3Pt7e7dVcZxsN72EenvVxs+G IwQmmDVy7MaFSC6dWaVcdQvWUnVo6oN1ntllf0r8W8O/eipnemNqg9h06kZdBijxOl65Oj DANV97MfUvSTvyNjDzBsr0Vl+Yla+3o0cAG/8VtIlML3hvS5ZrkPD2vJekLujQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665639862; a=rsa-sha256; cv=none; b=r+ENclPmqSZj6yTA+v4OOOhbmXRW5UUsqk6TyN157hpL+f8PyLI5NyJIus+308zbEUp7Ji ekXNZ45Y3crYLzJxmKBf5M/BHRWZl/mePlBPVIMKSb9n79eTefRcV55DdZo1H5K9wdFK22 ip3EKgG38JnlAEvfmskYACX3XYet9IDLS07VKtsO85rXB1BbRZV0R5cafSkHVyBJdL939v Yfsdqd6SUPsyQNCBezW1NVzm/NBFWerKIubQQQUEMTRar7zLW8406iHMbBCwhS/Z3hrDqu GZ5Pwqqu20QDR9FH8ed4KNYHVAOyHqJiF+gfWa9A0dlK9YOrgRM7AysABvX+5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pm.me header.s=protonmail3 header.b=HT+kYFr7; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pm.me header.s=protonmail3 header.b=HT+kYFr7; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CF56E1CFCF X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: xqqsWifg1bsK This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------3a1f9f68efc18772168effcd6dc9529b1f71ccec428d74d3108379e7e525202d Content-Type: multipart/mixed;boundary=---------------------f3da094df65d20ba05cf2f9a22263658 -----------------------f3da094df65d20ba05cf2f9a22263658 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain;charset=utf-8 * 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/stellariu= m" + "/releases/download/v" version + "/stellarium-" version ".tar.gz")) + (sha256 + (base32 "0gzksnskk0a105dji5j7hjizmyc7bs9riz6650hv417bq70i46= as")))) (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 tim= e - ("perl" ,perl) ; for pod2man - ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile t= ime - ("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=3D1" - (string-append - "-DCMAKE_CXX_FLAGS=3D-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=3D1" + "-DENABLE_QT6=3D1" + (string-append + "-DCMAKE_CXX_FLAGS=3D-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 -----------------------f3da094df65d20ba05cf2f9a22263658-- --------3a1f9f68efc18772168effcd6dc9529b1f71ccec428d74d3108379e7e525202d Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: ProtonMail wsFzBAEBCgAGBQJjR6VYACEJEPAAT+s3Q4ojFiEErbMphMGhBA17RriI8ABP 6zdDiiMmug/7B+hyBbKwg76rGpgdd0/7QD+wUw+Mh1HXIRDfJq+wHMTkDsFG ErXtEkxXOPrsUpHFhDlQYKvGQpNWeTjdrEkU0PhqJU68PBwEaYvtLg94FKVm lTT0pRSoA4Ab7EWlcgZ0FjuLJ1tDfGU8uMyADSv23A6LxfWOipBY5hyd5qvI Poq4ugMv9pJhJUoo5C6PjxYfivUOAgPiosRwbuEBsP7CmYlbMHTnAWMYnKkj onOJtRe0vORcpBhie+UwWM6M6JHO2EyPr1OJozfq9+O+Mhk00da6opi/2Zy2 X2bDQ8eeQAzDSO3ki4yvJMw4I4Mk95fjLjtU9YTns0hR2sscUkSRLC0zPNm6 XBACyqqfDlvX6AFyCEEXPVT3GQcphc/7yJaO0Rsx6xgtrRmgg3GVPTwdUAlE SQxH7ud6NQIozQGGBY2zCEiEJxyj9VZKKuvCV+XBCIHtaAWBtjWP5gNzCHBZ Fkv7C1OQx/kEcXoJqxxgM05ZfYMrzPKiPimwtbouAuwBL4VaMslJoYZ8dmgI x9p513HqKfNIg20B0iQz0+oczYVQl12yL8iuXwGSWOGAKUMQnuWng5ppfUde QDwT3JoyMYqkHcdRHUH2BBWAskpwNSDp+m3YBA21zAA9KoaZv4Ch3kpcdOwo HV0BPNloRLl+Pg7UlhN1dVnAYT5ZxzPsmEI= =ffMh -----END PGP SIGNATURE----- --------3a1f9f68efc18772168effcd6dc9529b1f71ccec428d74d3108379e7e525202d--