From patchwork Wed Feb 8 02:30:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46734 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 3F88F16CE8; Wed, 8 Feb 2023 02:31:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URI_HEX autolearn=ham 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 1371516D02 for ; Wed, 8 Feb 2023 02:31:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPaEj-0001iA-Us; Tue, 07 Feb 2023 21:31:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPaEg-0001hZ-PN for guix-patches@gnu.org; Tue, 07 Feb 2023 21:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPaEg-0006jq-HD for guix-patches@gnu.org; Tue, 07 Feb 2023 21:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPaEg-0005Si-E4 for guix-patches@gnu.org; Tue, 07 Feb 2023 21:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61357] [PATCH 2/2] gnu: stellarium: Update to 1.2. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 02:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61357 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61357@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 61357-submit@debbugs.gnu.org id=B61357.167582342120918 (code B ref 61357); Wed, 08 Feb 2023 02:31:02 +0000 Received: (at 61357) by debbugs.gnu.org; 8 Feb 2023 02:30:21 +0000 Received: from localhost ([127.0.0.1]:54378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPaE1-0005RE-5i for submit@debbugs.gnu.org; Tue, 07 Feb 2023 21:30:21 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:55820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPaDz-0005Qe-A9 for 61357@debbugs.gnu.org; Tue, 07 Feb 2023 21:30:19 -0500 Received: by mail-wm1-f54.google.com with SMTP id q8so12343618wmo.5 for <61357@debbugs.gnu.org>; Tue, 07 Feb 2023 18:30:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qTDImWJTLZ5b5Q3KkLleFUHx9WA8F3bPTvyOAZ6GjCE=; b=Ux7VLecgf2uae/FSwWtO+zFsx9YxQ3At+zZTQcZZ29MWY4BNH7hMCwf8+NrE68FQbO hYTOsYIU/XohPC5brhszxWVV16FlGOGgne4ZxZmnhveox4e5ovQiHe4Rb/fngZQQczsb 5RcxbXrA5rQjwXV+paDNi3E1iN2yha847DaSzIK2EmNrH0GklK8lGZizI/dI/alDFImB a06RrjGUF9RvaLplMzX+BeeGL6NbuwhU8dITKT1zypzEJ7mM9sadw+6w3kF5TMKYHJCa JJwOkuUJlqxa3C2uR+u3vtMJuS7Odyjykz9fu6AfhxxIHCsjDL/Yl4Z4aWyTED91GHvR RHeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qTDImWJTLZ5b5Q3KkLleFUHx9WA8F3bPTvyOAZ6GjCE=; b=CkxxD8OwQA9UomX/Nr+MTKv3vOt54+YuFZ8AQ3qlgu0UsbZwRK2kzldWmbgnGNpEOT nrvq0qcJd1VU2RVQqegiyAoDbhJrhYyyfncZv11oYXzfNAz1grQ0KKBnzSCAy3MhgcST aCTRmKXoqGaQoa60A0aLdMf7yT8SYN+AycRNtBOPFi5jWDlaztEstyrAiNz0RrXP6Vmv gi96qZwg9BEWaPg2k+mNbZ7vsoyTBGgubuushUzbnk4Olq71RScSLeaYXxzzeatPa+t3 seEYZbYgzChD5LiENkIv1WWp4MjTNH17vJXphFmSW1AlZ49u3pTeGNQRdJjLGy5nfJf3 XyAQ== X-Gm-Message-State: AO0yUKVQAf2TWwSMsxnteyZ4ABs5qoyebflZ6guSQXvfhKmxAHtqHyB0 3Sjkk8sw6ki6hu02pOBcbN/jyYMawYM= X-Google-Smtp-Source: AK7set+C9sfziw3RbHtQABcaO9a+HTlgiRKw2VDFyFhQHl6g8ZmJT8B+2XmLu/kiRRLLkq/mAGfjIw== X-Received: by 2002:a05:600c:2e95:b0:3dc:57e8:1d2f with SMTP id p21-20020a05600c2e9500b003dc57e81d2fmr4883580wmn.9.1675823413732; Tue, 07 Feb 2023 18:30:13 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r13-20020a05600c35cd00b003dc433355aasm472877wmq.18.2023.02.07.18.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 18:30:13 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Feb 2023 02:30:08 +0000 Message-Id: <20230208023008.3641-3-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208023008.3641-1-sharlatanus@gmail.com> References: <20230208023008.3641-1-sharlatanus@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As reported in https://issues.guix.gnu.org/58481 attempt to update to 1.0 with Qt6 has been failed. Stellarium is kept on Qt5 with future work to migrate to Qt6 when all components are ready. * gnu/packages/astronomy.scm (stellarium): Update to 1.2. [arguments]{tests}: Disable tests, with further review of INDI package. [arguments]{configure-flags}: Explicitly disable Qt6 (prevent failing build) and ShowMySky (not packed yet). [phases]{set-offscreen-display}: Remove trail #t in lambda. [inputs]: Remove labels and add gpsd, indi, libnova, openssl, qtcharts, qtpositioning, qttranslations, qtwebengine-5, qxlsx. [native-inputs]: Remove labels and add doxygen, graphviz, mesa, python-wrapper. --- gnu/packages/astronomy.scm | 77 +++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 26 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2f08b656c0..5cee981671 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -37,6 +37,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -44,6 +45,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 image-processing) @@ -70,6 +73,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages sphinx) #:use-module (gnu packages textutils) #:use-module (gnu packages time) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages wxwidgets) @@ -835,45 +839,66 @@ (define-public stackistry (define-public stellarium (package (name "stellarium") - (version "0.21.1") + (version "1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Stellarium/stellarium" - "/releases/download/v" version - "/stellarium-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Stellarium/stellarium") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "049jlc8vx06pad5h2syrmf7f1l346yr5iraai0wkn8s8pk30j8q7")))) + (base32 "1655lz848k7m4vqs7n3vxjwn5n4pkykwl6x7nbanqcqzlixm5xnk")))) (build-system cmake-build-system) + ;; TODO: Complete documentation build and split into dedicated outputs. + (arguments + (list + ;; FIXME: Tests keep failing on 100% when preparing test-suit for INDI. + #:tests? #f + #:test-target "test" + #:configure-flags + #~(list "-DENABLE_GPS=1" + ;; TODO: Enable when all of the dependencies are availalbe for Qt6. + "-DENABLE_QT6=0" + ;; TODO: Pack missing in Guix https://10110111.github.io/CalcMySky/ + "-DENABLE_SHOWMYSKY=0" + "-DENABLE_TESTING=0" + (string-append "-DCMAKE_CXX_FLAGS=-isystem " + #$(this-package-input "qtserialport") "/include/qt5")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-offscreen-display + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" "/tmp")))))) (inputs - (list qtbase-5 + (list gpsd + indi + libnova + openssl + qtbase-5 + qtcharts qtlocation qtmultimedia-5 + qtpositioning qtscript qtserialport + qttranslations + qtwebengine-5 + qxlsx 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))) - (arguments - `(#: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))))) + (list doxygen + gettext-minimal + graphviz + mesa + perl + python-wrapper + qttools-5)) (home-page "https://stellarium.org/") (synopsis "3D sky viewer") - (description "Stellarium is a planetarium. It shows a realistic sky in + (description + "Stellarium is a planetarium. It shows a realistic sky in 3D, just like what you see with the naked eye, binoculars, or a telescope. It can be used to control telescopes over a serial port for tracking celestial objects.")