From patchwork Thu Oct 13 05:35:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43358 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 DEB0427BBE9; Thu, 13 Oct 2022 06:37:17 +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 1BB9027BBEA for ; Thu, 13 Oct 2022 06:37:17 +0100 (BST) Received: from localhost ([::1]:33580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiquC-0005aF-1n for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:37:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqu3-0005Zm-Q9 for guix-patches@gnu.org; Thu, 13 Oct 2022 01:37:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqty-0003r4-9L for guix-patches@gnu.org; Thu, 13 Oct 2022 01:37:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqtx-0007yf-S9 for guix-patches@gnu.org; Thu, 13 Oct 2022 01:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 1/9] gnu: qtcharts: Rename variable to qtcharts-5. 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:37:01 +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.166563936530573 (code B ref 58481); Thu, 13 Oct 2022 05:37:01 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:36:05 +0000 Received: from localhost ([127.0.0.1]:58973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqt2-0007x3-If for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:36:04 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:60267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqt0-0007wY-Od for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:36:03 -0400 Date: Thu, 13 Oct 2022 05:35:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639356; x=1665898556; bh=SVgKKeAK9lSmIVyeKV6busaz4ufofL/L015McpQFoMo=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=n0wdbw7n6RkrJbnK7aid24mdoEQeUAX6lLpgZKaRp1+4iMpbhB1saWrTL01hYmtSB IhwD/7RfJMCuHd9gv5bx1grhXtF8QFGc7aOzwoC4QGKNLVoD8F9D97/7kj1u7yCdQS kyE9rOk/1I29Yp3FoX4O5lPZWXralFA/hTiiK2D644PAdd1q03WrPqfbxzv9M3SKC5 Tsj3S6ebsIOeSLEuOSeAjEAXdOs1sAvlULtA10UW8K/0WyC96w/D7OGrkQnob/i22f 53UE6xdg6Bb0ER1bnH1syM2JcI6c0EQRxh1QQPEETTJ9AuUZklXwEkvMrtKmabRYIT X44+cHkm4kVVA== Message-ID: 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 This is in preparation of updating qtcharts to version 6. This change was automated via the following command: git grep -l '\bqtcharts\b' | xargs sed 's/qtcharts/qtcharts-5/g' -i --- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 20df62fdfa..e4ec70bc7a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1247,7 +1247,7 @@ (define-public kuserfeedback ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) + (list qtbase-5 qtcharts-5 qtdeclarative-5 qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6e30980505..1efac2fb50 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2008,9 +2008,9 @@ (define-public qtpurchasing (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) -(define-public qtcharts +(define-public qtcharts-5 (package (inherit qtsvg-5) - (name "qtcharts") + (name "qtcharts-5") (version "5.15.2") (source (origin (method url-fetch) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f466678289..cba6d25b9f 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2009,7 +2009,7 @@ (define-public welle-io mpg123 rtl-sdr qtbase-5 - qtcharts + qtcharts-5 qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 @@ -2257,7 +2257,7 @@ (define-public sdrangel opus pulseaudio qtbase-5 - qtcharts + qtcharts-5 qtdeclarative-5 qtlocation qtmultimedia-5 From patchwork Thu Oct 13 05:37:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43359 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 53F7327BBE9; Thu, 13 Oct 2022 06:39:45 +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 1700127BBE9 for ; Thu, 13 Oct 2022 06:39:45 +0100 (BST) Received: from localhost ([::1]:52848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiqwa-00068w-76 for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:39:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqvu-00068K-VO for guix-patches@gnu.org; Thu, 13 Oct 2022 01:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqvu-00042h-5Q for guix-patches@gnu.org; Thu, 13 Oct 2022 01:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqvu-00081l-1c for guix-patches@gnu.org; Thu, 13 Oct 2022 01:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 2/9] gnu: Add qtcharts, version 6.3.1. 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:39:01 +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.166563949030790 (code B ref 58481); Thu, 13 Oct 2022 05:39:01 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:38:10 +0000 Received: from localhost ([127.0.0.1]:58979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqv4-00080Y-2H for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:38:10 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:38849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqv1-00080J-Qr for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:38:08 -0400 Date: Thu, 13 Oct 2022 05:37:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639481; x=1665898681; bh=L0aKpUKbGZYgip4qeZ1qHAmB7zaYhrpxgnNED//Gj3k=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=cX+MmiAcjnG3blZ3FMBUV0z42sTk+Zg6FG8s9D2wSWUZ+GoIQ7dTIJwu/fI30yC0r BAWiX0j/O5mOhEOkw6/pq8KsCac6lfB6UWK6q44ycvclyFKXEVT+I9HwNrsWKwT4+B 4ppC7jE3yCETeSUiheEJ90JU0/n1KNRx4dFNpaLPjzmI+txLZxZVYXXMm2gozADEhr FCdMqQYdq1+d0djWHvK9io022F0eh0VuBxo/g4eqlPh23aiK0Y+G4QlSn7qGBQ5Q9a eGe5xB07WBeC715w+gtcBeciO29vhUerVNU19i8Qri1wE0dD9QP+GNLFktKX7nLJm5 S7U4Xq+165YHw== Message-ID: <1-VbVDknMqvpSpgcwaXvffVK0JTueWkLiL_y3aF6gDVkJhFCT6kt9xWrbiD82SDnmqtyfzN7gYLQEdTUtAEVd7nZ7WgV1GNlPrTAPZ5yeq4=@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/qt.scm (qtcharts): New variable. --- gnu/packages/qt.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (name "qtdatavis3d") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1efac2fb50..e213657249 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2031,6 +2031,28 @@ (define-public qtcharts-5 selecting one of the charts themes.") (license license:gpl3))) +(define-public qtcharts + (package (inherit qtsvg) + (name "qtcharts") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1xvwsabyfln3sih9764xknl2s3w4w069k210kgbh94bj50iwqc7k")))) + (arguments + (list #:tests? #f)) ; TODO: Enable tests (two fail) + (inputs + (list qtbase qtdeclarative)) + (synopsis "Qt Charts module") + (description "The Qt Charts module provides a set of easy to use chart +components. It uses the Qt Graphics View Framework, therefore charts can be +easily integrated to modern user interfaces. Qt Charts can be used as QWidgets, +QGraphicsWidget, or QML types. Users can easily create impressive graphs by +selecting one of the charts themes.") + (license license:gpl3))) + (define-public qtdatavis3d (package (inherit qtsvg-5) From patchwork Thu Oct 13 05:38:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43360 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 CB72A27BBEA; Thu, 13 Oct 2022 06:40:30 +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, T_PDS_PRO_TLD,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 F411227BBE9 for ; Thu, 13 Oct 2022 06:40:29 +0100 (BST) Received: from localhost ([::1]:43124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiqxJ-0006Xt-5c for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqws-0006VT-RQ for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqws-00047O-Fd for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqws-00083e-9L for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 3/9] gnu: qtserialport: Rename variable to qtserialport-5. 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:40: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.166563954630892 (code B ref 58481); Thu, 13 Oct 2022 05:40:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:39:06 +0000 Received: from localhost ([127.0.0.1]:58984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqvx-00082A-D5 for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:05 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:49589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqvu-00081X-Fn for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:03 -0400 Date: Thu, 13 Oct 2022 05:38:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639536; x=1665898736; bh=pIUDI8cAW8f0jkGbd2HlOFZC9EOnNHmgs35TVL3xE6I=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=oV2z0ERyF4ChnyeA4Wx9GHmDFXEc4c2PNTIoDfI/wd8kwgqXNmAu97l5mh4/f1QQl j5YXx0vaZ8CWgZLOFvkAg/G2zrSSI12S6Moa1OBKAwdVR2AwddZZOUIOnRDdFwRRrN FitSSaBuQvNYO3ZNF9Vd+76syjromQWp44pJKVSmrdL6WS46sNRyEay38hcz5VTMYQ 4/N7F/svcYz5V5se1prCQLia5UK/USiX1hirf00rIsJSCNiAg+LoXU0S8cQTB0wB+F 1ZyGPiCPGXFmmZezM0dJfWtnS0NfuljfohoEIasEcZcyDNLlSiUJwuRNUIEpWakHQy jDHybssc6yHjw== Message-ID: 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 This is in preparation of updating qtserialport to version 6. This change was automated via the following command: git grep -l '\bqtserialport\b' | xargs sed 's/qtserialport/qtserialport-5/g' -i --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/engineering.scm | 4 ++-- gnu/packages/geo.scm | 2 +- gnu/packages/kde.scm | 4 ++-- gnu/packages/qt.scm | 10 +++++----- gnu/packages/radio.scm | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index aaa9207e0e..8c53611427 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -745,7 +745,7 @@ (define-public stellarium qtlocation qtmultimedia-5 qtscript - qtserialport + qtserialport-5 zlib)) (native-inputs `(("gettext" ,gettext-minimal) ; xgettext is used at compile time @@ -757,7 +757,7 @@ (define-public stellarium #:configure-flags (list "-DENABLE_TESTING=1" (string-append "-DCMAKE_CXX_FLAGS=-isystem " - (assoc-ref %build-inputs "qtserialport") + (assoc-ref %build-inputs "qtserialport-5") "/include/qt5")) #:phases (modify-phases %standard-phases (add-before 'check 'set-offscreen-display diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5c84b9ede0..7ee8691a7f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -713,7 +713,7 @@ (define-public fritzing "phoenix.pro"))))))) (inputs `(("qtbase" ,qtbase-5) - ("qtserialport" ,qtserialport) + ("qtserialport-5" ,qtserialport-5) ("qtsvg-5" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) @@ -3818,7 +3818,7 @@ (define-public candle "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) (build-system gnu-build-system) (native-inputs (list qttools-5)) - (inputs (list qtbase-5 qtserialport)) + (inputs (list qtbase-5 qtserialport-5)) (arguments (list #:tests? #f ; no tests. #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5e484c6e1c..97f561e362 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2622,7 +2622,7 @@ (define-public qgis qtdeclarative-5 qtkeychain qtlocation - qtserialport + qtserialport-5 qtsvg-5 qwt ;; saga diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index e4ec70bc7a..7b47abdc6d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -833,7 +833,7 @@ (define-public labplot libcerf lz4 netcdf - qtserialport + qtserialport-5 zlib)) (home-page "https://labplot.kde.org/") (synopsis "Interactive graphing and analysis of scientific data") @@ -1048,7 +1048,7 @@ (define-public marble-qt qtbase-5 qtdeclarative-5 qtlocation - qtserialport + qtserialport-5 qtsvg-5 qtwebchannel-5 qtwebengine-5 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e213657249..d589f653fb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1550,9 +1550,9 @@ (define-public qtwayland (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtserialport +(define-public qtserialport-5 (package (inherit qtsvg-5) - (name "qtserialport") + (name "qtserialport-5") (version "5.15.2") (source (origin (method url-fetch) @@ -1604,7 +1604,7 @@ (define-public qtserialbus (format #f "QStringLiteral(~s)" libcansocket.so))) #t))))))) (inputs - (list libsocketcan qtbase-5 qtserialport)) + (list libsocketcan qtbase-5 qtserialport-5)) (synopsis "Qt Serial Bus module") (description "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, @@ -1731,7 +1731,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport-5)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -3081,7 +3081,7 @@ (define-public python-pyqt ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtserialport" ,qtserialport) + ("qtserialport-5" ,qtserialport-5) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index cba6d25b9f..bebbbda071 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1381,7 +1381,7 @@ (define-public wsjtx ("libusb" ,libusb) ("qtbase" ,qtbase-5) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) + ("qtserialport-5" ,qtserialport-5))) (arguments `(#:tests? #f)) ; No test suite (synopsis "Weak-signal ham radio communication program") @@ -1420,7 +1420,7 @@ (define-public jtdx qtbase-5 qtwebsockets-5 qtmultimedia-5 - qtserialport)) + qtserialport-5)) (arguments `(#:tests? #f)) ; No test suite (synopsis "Weak-signal ham radio communication program, forked from WSJTX") @@ -1464,7 +1464,7 @@ (define-public js8call ("libusb" ,libusb) ("qtbase" ,qtbase-5) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) + ("qtserialport-5" ,qtserialport-5))) (arguments `(#:tests? #f ; No test suite #:phases @@ -2262,7 +2262,7 @@ (define-public sdrangel qtlocation qtmultimedia-5 qtquickcontrols2-5 - qtserialport + qtserialport-5 qtspeech qtwebchannel-5 qtwebengine-5 @@ -2394,7 +2394,7 @@ (define-public wfview (base32 "1kpkwxhcacgmprbr8xz840rj9a22513vxrh2q7d3js5i1dva8j2z")))) (build-system qt-build-system) (inputs - (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport)) + (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport-5)) (arguments `(#:tests? #f ; No test suite. #:phases @@ -2694,7 +2694,7 @@ (define-public qdmr (substitute* "lib/CMakeLists.txt" (("(DESTINATION \")/etc/udev/" _ directive) (string-append directive #$output "/lib/udev/")))))))) - (inputs (list libusb qtbase-5 qtlocation qtserialport yaml-cpp)) + (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp)) (native-inputs (list qttools-5)) (home-page "https://dm3mat.darc.de/qdmr/") (synopsis "GUI application and command line tool to program DMR radios") From patchwork Thu Oct 13 05:39:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43361 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 2BC9527BBEA; Thu, 13 Oct 2022 06:40:35 +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 E8F5227BBE9 for ; Thu, 13 Oct 2022 06:40:34 +0100 (BST) Received: from localhost ([::1]:40198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiqxO-0006jn-4D for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:40:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqwt-0006W4-64 for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqws-00047T-S9 for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqws-00083n-OZ for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 4/9] gnu: Add qtserialport, version 6.3.1. 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:40: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.166563958030939 (code B ref 58481); Thu, 13 Oct 2022 05:40:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:39:40 +0000 Received: from localhost ([127.0.0.1]:58988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqwW-00082w-0R for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:40 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:22103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqwU-00082j-GS for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:39 -0400 Date: Thu, 13 Oct 2022 05:39:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639572; x=1665898772; bh=kfKU6IgiMTzNh8xKK/PbL/DfnZBTz8aKAxfAL3B6fv8=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=d9gJyy5dZ45d9AEOceTOoCkU93pVyIDmEWqSO5xXid8qDwGRTIITND8ND2RVcneDM js8JaUg7/VXc4M80a8IwtTkj5Ki3YpoIcGI6Va8/ke1k/CI2hEmJB9PnUnFQt+blL7 zCy2qTsEtDLXblPseKH/nACsiOALyiBym/vW0tNyNu1XsQvgvJV7XCVU5yvzMlCH4Q KE3O6GchR18xwTlPpwEH3eN9kTAugneUd28wb7P/ThyJf/tdN6aUrvl1lrvojuf1Uo Svkj7nPZaaogbnFUQxllI0Dp5ntSvIilbVPXJLqv2rtw4eU+/yUmMj+gIwP7935/9j LgyMG9AkjaFLw== Message-ID: 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/qt.scm (qtserialport): New variable. --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (name "qtserialbus") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d589f653fb..d0d2c906a4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1580,6 +1580,35 @@ (define-public qtserialport-5 (description "The Qt Serial Port module provides the library for interacting with serial ports from within Qt."))) +(define-public qtserialport + (package (inherit qtsvg) + (name "qtserialport") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0vk17cjj9jpdkgd8qwb1x0lijg0p2jxdzx4d67hd57brcl7didjf")))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-dlopen-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/serialport/qtudev_p.h" + ;; Use the absolute paths for dynamically loaded libs, + ;; otherwise the lib will be searched in LD_LIBRARY_PATH which + ;; typically is not set in guix. + (("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b) + (string-append a #$(this-package-input "eudev") "/lib/lib" b)))))))) + (native-inputs + (list perl pkg-config)) + (inputs + (list qtbase eudev)) + (synopsis "Qt Serial Port module") + (description "The Qt Serial Port module provides the library for +interacting with serial ports from within Qt."))) + (define-public qtserialbus (package (inherit qtsvg-5) From patchwork Thu Oct 13 05:39:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43363 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 408D127BBEA; Thu, 13 Oct 2022 06:44:54 +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 C252527BBE9 for ; Thu, 13 Oct 2022 06:44:53 +0100 (BST) Received: from localhost ([::1]:37788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir1Y-0000Pz-VD for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:44:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqxr-0007H0-Ku for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqxq-0004T9-Bp for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqxq-00085r-7r for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 5/9] gnu: qtimageformats: Rename variable to qtimageformats-5. 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:41: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.166563961531030 (code B ref 58481); Thu, 13 Oct 2022 05:41:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:40:15 +0000 Received: from localhost ([127.0.0.1]:58994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqx1-00084I-CA for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:40:15 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:18227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqwv-00083Q-9t for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:40:09 -0400 Date: Thu, 13 Oct 2022 05:39:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639598; x=1665898798; bh=FlPFi+KBYkmHPYtxyWx5rFGjNBa/vE4xOu0BDzeQNXE=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=L931OBW9Gau6m5b+u+++NPfWoX0DksTU/qX2NFSLrwzJrVVj5bWrNFLZOolGBc+i9 ZXU9S5d6w6tXAu6tzrBYCe9LnKMBb/vPEm5yXjoQpefVcLsFohNLhumRQ6UlvGbjme UayP5cBdjl39ivCldpKC89FMXua2LrOyDA4nBNw2gfuzUxeJcj8h94r325LTa0hJk2 pVQ0Ru1CtvTNonOOV/B5GkSXf6gIDczvQu8lbR8MwL8qBLMgtudy62IYxmALtAtFfP q6AyDH3+GE8Psn5A0Ueu3GcLOa40bv8S9oB26acniJEafR5veyioUXCLPD9H1l629d MmqFSDrg0zQdA== Message-ID: <06tsV7P2mFf3plajeILmCw1cf9WJKHVkoxyorrpSarxzNb8U50PD8VoUsOTw1PqVmN1X_LwrAkCocjXwSbON1xyaI-JtxBrlBc9UuEFA3HA=@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 This is in preparation of updating qtimageformats to version 6. This change was automated via the following command: git grep -l '\bqtimageformats\b' | xargs sed 's/qtimageformats/qtimageformats-5/g' -i --- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/telegram.scm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 97f561e362..0ecfbc75c5 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2229,7 +2229,7 @@ (define-public openorienteering-mapper ("gdal" ,gdal) ("proj" ,proj) ("qtbase" ,qtbase-5) - ("qtimageformats" ,qtimageformats) + ("qtimageformats-5" ,qtimageformats-5) ("qtlocation" ,qtlocation) ("qtsensors" ,qtsensors) ("zlib" ,zlib))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 77979e8b8f..6e41cb5fdb 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -714,7 +714,7 @@ (define-public qview (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtimageformats qtsvg-5)) + (list qtbase-5 qtimageformats-5 qtsvg-5)) (home-page "https://interversehq.com/qview/") (synopsis "Convenient and minimal image viewer") (description "qView is a Qt image viewer designed with visually diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d0d2c906a4..85f9c0716c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -948,9 +948,9 @@ (define-public qtsvg (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtimageformats +(define-public qtimageformats-5 (package (inherit qtsvg-5) - (name "qtimageformats") + (name "qtimageformats-5") (version "5.15.2") (source (origin (method url-fetch) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82c9227ba8..d64d2eaf1d 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -500,7 +500,7 @@ (define-public telegram-desktop pulseaudio qrcodegen-cpp qtbase-5 - qtimageformats + qtimageformats-5 qtsvg-5 qtwayland-5 range-v3 From patchwork Thu Oct 13 05:41:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43364 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 8025B27BBE9; Thu, 13 Oct 2022 06:45:18 +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 C8D6227BBEA for ; Thu, 13 Oct 2022 06:45:17 +0100 (BST) Received: from localhost ([::1]:49056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir1x-0000a5-0M for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:45:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqyo-0007eZ-ST for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqyo-0004h2-KH for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqyo-00087l-Fw for guix-patches@gnu.org; Thu, 13 Oct 2022 01:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 6/9] gnu: Add qtimageformats, version 6.3.1. 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:42: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.166563969331191 (code B ref 58481); Thu, 13 Oct 2022 05:42:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:41:33 +0000 Received: from localhost ([127.0.0.1]:59002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqyL-000871-0A for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:41:33 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:52207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqyJ-00086o-As for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:41:32 -0400 Date: Thu, 13 Oct 2022 05:41:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639685; x=1665898885; bh=YrrXaLaOEIAxGUDYFNnX+ZvUrLvs1uwz6COJj9xO0pU=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=r7yUKFULVjjWAnifbXuXgEbFg5gpNR09mNIgVxJi52lKl3bhK96z2twycuHL4l8Lb Q8MKt6YGdtGLHNnKWXib/DfqpCqv6bQWoHr4rIjQCWqepROCZhIFtnG7C39GFPkpgb 7zanXoYX3t4RrfaSZBX9xRvQ4INX/Xf/ElmtkQAwVuVSo2KzYLzScHZVnGYsYVMJZC Kw1U1QIKJ07UTr8gHct3M3uv9/zszTI69yq+Mi5FGsHY4LYueMcosWXGJoJhBnAkGn diEsCmwIUwTBqMPs1+Q61ko/csvFXjmMkEtTPQByj+GuKksZv6ojV5kot339bnmEig MnuFZvXxJOcIw== Message-ID: 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/qt.scm (qtimageformats): New variable. --- gnu/packages/qt.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (name "qtx11extras") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 85f9c0716c..2d9923b19f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -986,6 +986,47 @@ (define-public qtimageformats-5 (description "The QtImageFormats module contains plugins for adding support for MNG, TGA, TIFF and WBMP image formats."))) +(define-public qtimageformats + (package (inherit qtsvg) + (name "qtimageformats") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0br1vqgx0hcc2nx32xviic94mvj6fbagrnzskdr7zdmvvyw140xd")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/3rdparty") + #t)))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* + "src/plugins/imageformats/jp2/qjp2handler.cpp" + (("^#include ") + "#include \n#include ")))) + (add-before 'check 'set-offscreen-display + (lambda _ + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" "/tmp")))))) + (inputs + (list jasper + libmng + libtiff + libwebp + mesa + qtbase + zlib)) + (synopsis "Additional Image Format plugins for Qt") + (description "The QtImageFormats module contains plugins for adding +support for MNG, TGA, TIFF and WBMP image formats."))) + (define-public qtx11extras (package (inherit qtsvg-5) From patchwork Thu Oct 13 05:42:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43365 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 3305327BBEA; Thu, 13 Oct 2022 06:45:30 +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 DA56227BBE9 for ; Thu, 13 Oct 2022 06:45:29 +0100 (BST) Received: from localhost ([::1]:37524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir28-0000lw-Vi for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:45:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqzn-00081N-7l for guix-patches@gnu.org; Thu, 13 Oct 2022 01:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqzm-0004jg-3C for guix-patches@gnu.org; Thu, 13 Oct 2022 01:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqzl-00089P-R6 for guix-patches@gnu.org; Thu, 13 Oct 2022 01:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 7/9] gnu: Add qxlsx. 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:43:01 +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.166563974431283 (code B ref 58481); Thu, 13 Oct 2022 05:43:01 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:42:24 +0000 Received: from localhost ([127.0.0.1]:59007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqzA-00088V-Cy for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:42:24 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:58041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqz7-00088I-Uh for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:42:23 -0400 Date: Thu, 13 Oct 2022 05:42:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639736; x=1665898936; bh=1k2L7TtOLr3YFcARS+v1Y7ih+SuuAUxHP2eEYZli/zQ=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=AoxAXHNIvO7xuJGNzunLoDE9WQg61bO257AZVX+shmHzdIG4Rn72IZQ4mZ61oyNA6 fn3BazxhA7IW5Frf9dScu7BVOrhy1NOvax50vQTIj2AyMd9+VCAGOFyZyQTKS/viCZ 4Z5UGXJCXrAWHcoKFRD4qHhmVutmQ6h/f+85VmlJgea074RJZxDuC3m75ZipGjZ6Zx urt34OgNUVSEULc/W25B91kq4BrJp+u6y1OQ/EMNzrKUKUHtiiFXl3dP8q+S8IYivQ kU+5pyYZKTDm4StToYeHsA0RmIhNzmoS5Bb/E9wKkmGZQk/rjSdaG6JMPhy+in08lt IFtQUl9IAI4TA== Message-ID: 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/qt.scm (qxlsx): New variable. --- gnu/packages/qt.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2d9923b19f..6169d8bb65 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2022 Foo Chuan Wei ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Cairn ;;; ;;; This file is part of GNU Guix. ;;; @@ -4390,6 +4391,32 @@ (define-public kdsoap web server.") (license (list license:gpl2 license:gpl3)))) +(define-public qxlsx + (package + (name "qxlsx") + (version "1.4.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/QtExcel/QXlsx/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h11pviill9m749408xygkvkxik002va27n1d6zyg7bbjiwbnlfk")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ; No rule for tests + #:configure-flags + #~(list "-G" "Unix Makefiles" "../source/QXlsx"))) + (inputs + (list qtbase libxkbcommon)) + (home-page "https://qtexcel.github.io/QXlsx/") + (synopsis "Excel file reader/writer library using Qt") + (description "This is a libary for reading and writing Excel files +(.xlsx) using either Qt 5 or 6.") + (license license:expat))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances From patchwork Thu Oct 13 05:42:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43366 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 30BD427BBEA; Thu, 13 Oct 2022 06:46:00 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED,URI_HEX 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 E26EB27BBE9 for ; Thu, 13 Oct 2022 06:45:59 +0100 (BST) Received: from localhost ([::1]:42654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir2d-0000vf-1K for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oir0k-0008P7-JU for guix-patches@gnu.org; Thu, 13 Oct 2022 01:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oir0k-0004n3-7z 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-0008BM-3f for guix-patches@gnu.org; Thu, 13 Oct 2022 01:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 8/9] gnu: Add calcmysky. 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.166563979031369 (code B ref 58481); Thu, 13 Oct 2022 05:44:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:43:10 +0000 Received: from localhost ([127.0.0.1]:59012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqzt-00089t-QA for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:43:10 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:23101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqzk-000898-2t for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:43:08 -0400 Date: Thu, 13 Oct 2022 05:42:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639774; x=1665898974; bh=8+vFF1vVgKMaNH9TPF1l0GWgnMOlnmrg5E7jk96N7KQ=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=qAYus3/Vtt+FbG6LJO5Zy+gxZyhIUTxvlKkDzIzY4K8JHQw9z+1tiAap0wLg+NNoF 2jcn84ks5ZMDe+SU6Rvjavkrbp5qVxrmYsFAN+5Y8yfUbU35+5jT4Olg3wXch/JlIU NSPNOpZDLy4h9J6BK1k1X3cdmjRDXUL13DwPBPdhb0C2RcMH4Wsfocpz6W2y557oAy b6ICAMQWjZ10+3p7m809Zupz6a6lKnSloNz+DyeHnDbAcuatA0f7FgZgDuEn3cJrjc jMNkRiUY0xwwuNbuNug3K0LvXACY8Tn5OPJNGZE5rjHF3Hyax0B1jdzrIOMFuV2EGK gH0y77wETywZQ== Message-ID: 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 (calcmysky): New variable. --- gnu/packages/astronomy.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (name "stellarium") diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 8c53611427..72e923e895 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2021, 2022 Vinicius Monego ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2022 Cairn ;;; ;;; This file is part of GNU Guix. ;;; @@ -727,6 +728,34 @@ (define-public stackistry deconvolution). Such post-processing is not performed by Stackistry.") (license license:gpl3+))) +(define-public calcmysky + (package + (name "calcmysky") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/10110111/CalcMySky") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13wk73c0xyh6c1zpxjzny987x0qdy1gcqy2y5r5a5hiqx4fz3lfj")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DQT_VERSION=6"))) + (inputs + (list qtbase + glm + eigen)) + (home-page "https://10110111.github.io/CalcMySky/") + (synopsis "Simulator of light scattering by planetary atmospheres") + (description "CalcMySky is a software package that simulates scattering +of light by the atmosphere to render daytime and twilight skies (without +stars). It consists of three parts: CalcMySky, ShowMySky and libShowMySky.") + (license license:gpl3))) + (define-public stellarium (package 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