From patchwork Sun Jun 25 21:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14334 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 127B527BBEA; Sun, 25 Jun 2023 22:29:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 88BCF27BBE2 for ; Sun, 25 Jun 2023 22:29:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIW-0000NO-OC; Sun, 25 Jun 2023 17:29:28 -0400 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 1qDXI8-0008PA-KW for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI8-0003qd-6Y for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI5-0004po-O0; Sun, 25 Jun 2023 17:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 1/9] gnu: weightwatcher: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772851518483 (code B ref 64287); Sun, 25 Jun 2023 21:29:01 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:35 +0000 Received: from localhost ([127.0.0.1]:43802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHe-0004ng-Ma for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:35 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:60711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHa-0004n4-81 for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:33 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-3f9bece8e19so42894645e9.1 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728504; x=1690320504; 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=8rwJauMjg7Wyli77qKZjWdb5hbgiy4nRMIBVI1jLZbo=; b=am7uhk4f4f+rzcF0RPoYu5MM60U8UCI5b0jug9FQQA7o8ExnW8tqhlTyZ5KvP9DCq8 MujYfOmu0DnbcF0lR+SgbvZu4/p2sJhWErD3KnDfafgA0sG2t61hUI2vdO7nHpmfHZP/ xR8unisWuLry571gXqr5kCejDUlt19DT/T4F9AoXPd4tqRA2h78yjqrpWnBIX/kHZjwh uEsr986mFkZTA/LoZ8FqdnpiI8DDaZmHs3Tij0XG5Q3VD5UZwj/6SsBL+JKd77JOeRZW M6t0pkhg4bV1avk7hSP96lM45fVyA2ooQ4URa3zaBtG2a0wkdZ+ED73T3bCfnRvJooje fM0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728504; x=1690320504; 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=8rwJauMjg7Wyli77qKZjWdb5hbgiy4nRMIBVI1jLZbo=; b=JWJOwklL12k2zs/++C/fDGTx6yvs2+8fYHKthhf114zxXaxXFI75keT+pKNt6AAoIe ChxqBthqveUyHYtmk6EhflFRruxO9HEFCgjkOUpqlLUzMrXhZUSJIgXGL28UfH+aYtnw 4LXYsbP3+V9EWDOowuDpGagB8ZdqtB5X1B0SQir3DWr/a8t3kMUNMp6Eorro03lWdus/ DJ9fRwd8RKl1FgPZM4s2WEUo/Alyp2gBNdd9i4TrjdYqn7DaLtCDj4sz1zb3lwABo9hI BeDtIt5HZmU6nNRQNTL4THUohBqDqz24ReBIAQke8/3yMNNai2Fn+mTCb5ivp9tNL5dh KUpQ== X-Gm-Message-State: AC+VfDxEbZVGYDf1yFadnjfZw6mQZCQn2hmoNr4YWc5u0tvy3567lVEd /E66hlOg6z968KC6uSeLg7Iy1IVG5HA= X-Google-Smtp-Source: ACHHUZ5m+8cvkfZU25nkv1bXJXCRibih7ZUY7ztwKtXY+1PfODeN/JpgLN/wFYLdJEOutvUs0szoGw== X-Received: by 2002:a7b:c3cf:0:b0:3fa:85ad:6672 with SMTP id t15-20020a7bc3cf000000b003fa85ad6672mr6157543wmj.41.1687728503956; Sun, 25 Jun 2023 14:28:23 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:23 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:13 +0100 Message-Id: <03d1a3b2e920b08aceff49350d4719a3d88e4fc9.1687727967.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (weightwatcher): Fix build. [source]: Swap to 'git-fetch, as source was removed from home page. [arguments]: Add #:configure-flags to fix the build phase. --- gnu/packages/astronomy.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6c43003618..a7faa2c425 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -641,12 +641,22 @@ (define-public weightwatcher (version "1.12") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/weightwatcher/" - "weightwatcher-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/weightwatcher") + (commit version))) (sha256 - (base32 "1zaqd8d9rpgcwjsp92q3lkfaa22i20gppb91dz34ym54swisjc2p")))) + (base32 + "0701z6bdqq32jv7ga3n6jh27q684ni0hbfjm1mak7rh0qqx089gi")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; Address this link error: + ;; ld: ... multiple definition of ... first defined here + "CFLAGS=-O2 -g -fcommon"))) (home-page "https://www.astromatic.net/software/weightwatcher") (synopsis "Weight-map/flag-map multiplexer and rasteriser") (description From patchwork Sun Jun 25 21:28:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14339 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 635DF27BBE2; Sun, 25 Jun 2023 22:30:46 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 0E39227BBEC for ; Sun, 25 Jun 2023 22:30:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIV-0000Je-Jf; Sun, 25 Jun 2023 17:29:27 -0400 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 1qDXI7-0008Op-F0 for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 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 1qDXI7-0003qQ-50 for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI6-0004pu-5w; Sun, 25 Jun 2023 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 2/9] gnu: swarp: Update to 2.41.2, fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852018499 (code B ref 64287); Sun, 25 Jun 2023 21:29:02 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:40 +0000 Received: from localhost ([127.0.0.1]:43806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHj-0004oJ-GX for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:39 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:49541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHa-0004n5-QU for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4fafe87c6fbso906295e87.3 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728505; x=1690320505; 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=b7DS0jd1wQJN8mrXBCHU3hMRw5uT+z/kwWj2HU/i4Y8=; b=AM9lSI/3b7gXS0ZlVcctNB27Umb9qa2uPY+YVewsfmGYRJsGoGvWqw7PbF/p76Ylmk b4t/3c9gfhuoOI8ttmnOMVqLUuR3FM3HSrtPgWy4X9MJJIBtBew6+EPN5BHAKYK2WF8/ XQvNYVW/piq29bOIXUcxROz9WdCtGpIUdn9DGtaVHJGgMa03YV9nhjIZPV/pG/12ornF oRkJXbzR7S3BoA7hKoP7QbOMBlAecAyq+8OJwREqCezwWG9RX23TdZzvaVezuFCEOuf+ oFxMxIDy3aQ6JIshKyJrRgUFnGX+RBAVtSxswFPT6/OTUAN4F+zsUVlxLPxUK+7jDtQt f20g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728505; x=1690320505; 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=b7DS0jd1wQJN8mrXBCHU3hMRw5uT+z/kwWj2HU/i4Y8=; b=bpn66sS6ju0uggaDZGQ87LIRmOpN99jV/xy8MS20uAs6lGMBr2bAJGY8TeXxW8kcXn btPL9jefoi8ZXTc1XKbUFtp9q0jg8NiqgCnxLdnf0f7AaTs/ykfhBs0gOzXTugk0YmgJ /gyV1JDulKYRKbSNAGKeuCRx45inQVvk6Hvnr7LX1q8UlVn1UjJY35U469zZ/dW8JtUA qwXvQt+j4ZOsa84cJ14/qxf9Xes2wHd7LuKqF6grZkmLT5dAWBnvWTWHp4nEz5bhmFlD Zud3wL57BzxhiL2TW6gjrqAmNhreyf9+7MNS92I/wyonWBQVVdPIQThlIaaY9MP8p8ru +zlA== X-Gm-Message-State: AC+VfDxU5hzqE4S57HsLAAlFsFb6aHYsEVbgBIuvrMSGa0uhgRAhnhpD RTRJ+mwDBnw+zD9J/J2Jh2liLe2Yyf0= X-Google-Smtp-Source: ACHHUZ4qq/fbk6VLO2kAxjx+MQ68CGOuoe1w4A+YNOF+TczJUkXVwxuVtHJghDcnseif/4uTAY3E3w== X-Received: by 2002:a19:915d:0:b0:4ec:9ef9:e3d with SMTP id y29-20020a19915d000000b004ec9ef90e3dmr15967159lfj.26.1687728504706; Sun, 25 Jun 2023 14:28:24 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:24 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:14 +0100 Message-Id: <7e40590ad060bef311017b13740651748867e528.1687727967.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (swarp): Update to 2.41.2, fix build. [source]: Swap to 'git-fetch. [native-inputs]: Add automake, autoconf, libtool, pkg-config. [inputs]: Add cfitsio. --- gnu/packages/astronomy.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a7faa2c425..17bc4ed7d7 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1073,15 +1073,28 @@ (define-public stuff (define-public swarp (package (name "swarp") - (version "2.38.0") + (version "2.41.2") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/swarp/" - "swarp-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/swarp") + (commit (string-append "v" version)))) (sha256 - (base32 "1i670waqp54vin1cn08mqckcggm9zqd69nk7yya2vvqpdizn6jpm")))) + (base32 "1ycdk5h77mflw3hnmkczj1m2603aks9vq6555f3vc5vj1shx2d4m")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; Address this link error: + ;; ld: ... multiple definition of ... first defined here + "CFLAGS=-O2 -g -fcommon"))) + (native-inputs + (list automake autoconf libtool pkg-config)) + (inputs + (list cfitsio)) (home-page "https://www.astromatic.net/software/swarp") (synopsis "FITS image resampling and co-addition") (description From patchwork Sun Jun 25 21:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14336 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 0C7C627BBEA; Sun, 25 Jun 2023 22:30:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 6591627BBE2 for ; Sun, 25 Jun 2023 22:30:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIY-0000PB-BH; Sun, 25 Jun 2023 17:29:30 -0400 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 1qDXI7-0008Oo-CC for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 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 1qDXI6-0003qL-NY for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI6-0004q5-IA; Sun, 25 Jun 2023 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 3/9] gnu: eye: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852018508 (code B ref 64287); Sun, 25 Jun 2023 21:29:02 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:40 +0000 Received: from localhost ([127.0.0.1]:43808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHk-0004oP-0h for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:40 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:52362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHb-0004n7-6g for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f9bece8d1bso33384695e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728505; x=1690320505; 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=Hpc6VzG01diOfSboyj11sAHOunsDs6ncEUFvzwyaOzk=; b=VhWglmvvMHoUJfnzY0JvTi7a/0lZWOctz1xueALPRsO0Cf65RHgThEvjJb6My5MK0J OeIf+PaUa2BXzJxE5TxyeoM0uErYhjmsNJ0ISujKCnop09u8Bkrc4ha35/ELXfq9yOpS zC5vi/8cW3V6OKV1FNIic1EOdF5itP2axpfNFLiOt4chtf9OwksAm1V2lRRHmnld6Xs8 6aYkB2g+NB0nr/qcWOhaw0fpH+jm9S2+kChL3mZssnuAGSz2JX6Di3X7V6NqUw+NaIlQ Y6F8NYLRXu5B6Ee4lxu14/HHDPKIedyrGhrnziIO0bjG4/q084OqcjhEXf058shp48bM kEFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728505; x=1690320505; 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=Hpc6VzG01diOfSboyj11sAHOunsDs6ncEUFvzwyaOzk=; b=Y/xkyStYSKuWFSzOMfCuNf+1sRq7m836MTxGqAbTiM1SpKaruUuZEH92emsaq/EBUq oqMJ6ZQPR8xQzyuc6kiGUm4xEYb3cWOyQHCo7/BDGkqiNWKUZZLkww2PkJx8slVVgB+L IFXR4kXcyZCtxg7dTAREk1GgP5s21yPjb3/kfmmP6Jf2myO2omLtv8SXCc2A/DrXztaJ nB1KRR7WUTsgV+xy9sqLNh2mUfeMK5XR6pn0KBctKlLUoY05foEuofc8ULAqewM6MSTk X9uTy1BaLFdkQc4TPly801CWUCsqPHtIggo1Ut9cV5uUTj6PotuRkoI7016o4p2gG9KG Uxtg== X-Gm-Message-State: AC+VfDzdTG9Y/UdeEWxL/zzYRm4eXp8qTliaz1aPzQsDIxaiK9OPjPaM lnxphhiBna4+UHPu7ULIONMgjPCq7PA= X-Google-Smtp-Source: ACHHUZ4YYVpr5rm9yzmJsTi5B04/1Q3jvC3ubPMPQCWTrU4jSmkH/UTrAoz5E+yhpuZOWCbefrC/DA== X-Received: by 2002:a7b:c405:0:b0:3fa:97b3:7ce0 with SMTP id k5-20020a7bc405000000b003fa97b37ce0mr349313wmi.26.1687728505429; Sun, 25 Jun 2023 14:28:25 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:25 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:15 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (eye): Fix build. [source]: Swap to 'git-fetch [arguments]: Add CPPFLAGS to pass build with GCC 10. --- gnu/packages/astronomy.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 17bc4ed7d7..326a9a170e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -579,12 +579,21 @@ (define-public eye (version "1.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/eye/" - "eye-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/eye") + (commit version))) (sha256 - (base32 "092qhzcbrkcfidbx4bv9wz42w297n80jk7a6kwyi9a3fjfz81d7k")))) + (base32 "1j8rpgz3fjp6fw0qmxgfqycf3n01fzxds4w12vgyrhbnk658ia41")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; Address this link error: + ;; ld: ... multiple definition of ... first defined here + "CPPFLAGS=-O2 -g -fcommon"))) (home-page "https://www.astromatic.net/software/eye") (synopsis "Small image feature detector using machine learning") (description From patchwork Sun Jun 25 21:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14341 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 0D9CD27BBEA; Sun, 25 Jun 2023 22:31:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 6846727BBE2 for ; Sun, 25 Jun 2023 22:31:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIW-0000M3-1v; Sun, 25 Jun 2023 17:29:28 -0400 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 1qDXI8-0008P9-KF for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI8-0003qb-3O for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI6-0004qD-UR; Sun, 25 Jun 2023 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 4/9] gnu: missfits: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852018515 (code B ref 64287); Sun, 25 Jun 2023 21:29:02 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:40 +0000 Received: from localhost ([127.0.0.1]:43810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHk-0004oT-CK for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:40 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:52356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHc-0004n8-0I for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f9bece8d1bso33384775e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728506; x=1690320506; 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=8IlvsuEDKE6vE0tusSZ8e/6ZT926sWjdFLVu/KjzPso=; b=amS3rj0Vt9j4qx6SpAFvFwRUV4kkwUIJdxpJTsk3j2WGHeS8HhzL+D8lxU2iRfMnnR Y9iW3j8B0OBwqzft4aZkq/wdSl6zGS5Rp8DVGh7hHNdHcnKrVfIr7GlCTzdCM6ihHfUQ JCNp0CFsVzYruGZVkEawBXbz9k5AzkhHTGhOxU+KY+JSD6lwwvYD7Z/QPFlK+R9p7YFJ tEqN8sn/rAiv0e5EQEJSdqDfIQtkKc0B1szei8bGhc6kz6gaEVLDDsrDCePPKGN9QiTt km7jWY5U+XurUdML83Ene6LAcZpIh+X7jkj/1z6UYuSdVOcc0ETyZfXZEuGYY+s0jlbP F5AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728506; x=1690320506; 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=8IlvsuEDKE6vE0tusSZ8e/6ZT926sWjdFLVu/KjzPso=; b=l/HSwkNfHagmlkQDLQvJt7GbZtMMylxtUmNPLeSKjoLdJ+GYs7BsJNu/2lE1JfQWCv kHvu3XPDnG6csR0CR4uvNuHORF6iAvll5cOf9Sg3Y1bVb38vF5DURuy8y8tZMo2dwGGK IxES/ZQ604gdzaVJ0smZk7JrAgr3WzWarcr1eKy3akDP5NYJHVMVEp2KtjBNGRS5wmN/ DtdBFYzucTC2CVFmCZVV8FfUQdYq7Ce2dSQO4nr5iCBxYLTQ9x/gW1qE5mBk5wgVOrMN mu55iFznni9f2Rfv7O0RW1kiDPi6fMTWTQoRxVAVmZWizwOShjYReTl6ChIpo2VIVbWI qELg== X-Gm-Message-State: AC+VfDyKIjW9Mn4VN0HZ/aTdO75J4FeQ4EqyYoD+4Eb8u0lc6Em0xKvT bsp1dV46Wmy+XtPc8lCSaMNWjyXAHJw= X-Google-Smtp-Source: ACHHUZ7s2VSHt7/+jl+WlaHK/ZSrlbUhmaaKQCq3LRonAyWiGC9t4wguRhTjtC0Hb2QfKb6e0yVn4w== X-Received: by 2002:a1c:750a:0:b0:3f7:cb42:fa28 with SMTP id o10-20020a1c750a000000b003f7cb42fa28mr21993556wmc.28.1687728506103; Sun, 25 Jun 2023 14:28:26 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:25 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:16 +0100 Message-Id: <1e52f7155bcaf6a73a32c5d8b17d450d060abf82.1687727967.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (missfits): Fix build. [source]: Swap to 'git-fetch. [arguments]: Add CPPFLAGS to pass build with GCC 10. --- gnu/packages/astronomy.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 326a9a170e..4c869fc295 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2653,12 +2653,21 @@ (define-public missfits (version "2.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/missfits/" - "missfits-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/missfits") + (commit version))) (sha256 - (base32 "04jrd7fsvzr14vdmwgj2f6v97gdcfyjyz6jppml3ghr9xh12jxv5")))) + (base32 "12ndvrr3l5j7ph2i5f3qf0wqmv5ymsyjzxnnypqajsvliw72iprh")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; Address this link error: + ;; ld: ... multiple definition of ... first defined here + "CPPFLAGS=-O2 -g -fcommon"))) (home-page "https://www.astromatic.net/software/missfits") (synopsis "FITS files Maintenance program") (description From patchwork Sun Jun 25 21:28:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14337 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 15BF827BBE9; Sun, 25 Jun 2023 22:30:44 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5030627BBE2 for ; Sun, 25 Jun 2023 22:30:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIU-0000Et-UB; Sun, 25 Jun 2023 17:29:27 -0400 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 1qDXI9-0008PC-KX for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI9-0003qw-CG for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI7-0004qP-Bz; Sun, 25 Jun 2023 17:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 5/9] gnu: skymaker: Update to 3.10.5-0.1a69c47, fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852118522 (code B ref 64287); Sun, 25 Jun 2023 21:29:03 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:41 +0000 Received: from localhost ([127.0.0.1]:43812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHk-0004oa-Mz for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:41 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:54390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHc-0004nA-Sb for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4fb7769f15aso41433e87.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728507; x=1690320507; 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=m7N03sKJ2ASFFcncFF6vZJpyp1XqK21W+y7DN26lOug=; b=JdO++mO+PpZEBJMCobjd/5dFLzEtT4oF32srrN3mWQhBS5L/qSg/+/JnTvSEcCBZVa nxF95Alp6/9golKOPOuRr9qsFP+iUxNi7tkHFbhUUH87bs/25KlgajYbtkqR00iX8dIe 5YaOPSFExsXGP0GPmGIzWGs1qt0egd2HazZozUDa/f28RoU9tMmPBAtSoJ+BIQHEduof Eq9isH3wCT2AiQFn9MfIbUm0iKOdsIfDtPSBwxij78Wgf7E7mfdJB+e3J7qn8fjWBb0U V87U2eBf+FdfY5MTtxO2+4aweNe36a+7GIPA0JTovSRcLSc2mYWn24IFdu7JKp9LUmr8 KX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728507; x=1690320507; 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=m7N03sKJ2ASFFcncFF6vZJpyp1XqK21W+y7DN26lOug=; b=cEKxLe1RubxaZLDZjx010Vuwizo8DxAddwZc83KkH4sQxF68CP6ZXR9sxb59o9c3vM JkFzdRHGJw/orIlVfdPbquC3Serb/N1Sn1mjfZNRvLkXuV+abALhvSPZPv363xUrLDyu +8SCQAnNLwOtXSSMYW/Z3UyoF5W/hqW5+6By71MQe2uBnNjz4i8DWFvSg56J7U5YuV1H O/N8NR+mIIMCddfiY7PjDb6/JPFRJD5FMmH5CwJTCtP5iK7o/Kfe0BiekIr82x31YKK0 nnnLbEX7rWCUyfIcqn2/yY5MYd2JlhmVoXpiPf7lrw2okPRo6buaEl63nu1wYUFOZTjB 5Sag== X-Gm-Message-State: AC+VfDxdBvnAdaUga0xlN7HMefsoznPlW66z69cyvJ/8NZuxN47Ioy5n Be9REbVAiPVoDTC2f6dpAulkc2DfUtc= X-Google-Smtp-Source: ACHHUZ4WGrXLdA9MBhr55Bo3nwGzJDILeQog5H7mAigATI0KelGN1aDcapwBSfwn/7UTWOQxPmdcvw== X-Received: by 2002:ac2:4bd0:0:b0:4fb:b11:c99d with SMTP id o16-20020ac24bd0000000b004fb0b11c99dmr925956lfq.57.1687728506858; Sun, 25 Jun 2023 14:28:26 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:26 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:17 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (skymaker): Update to 3.10.5-0.1a69c47, fix build. [source]: Swap to 'git-checkout and pin to the latest commit as upstream version tag is not available. [arguments]: Use G-expressions. #:configure-flags add CPPFLAGS to pass build on GCC 10. [native-inputs]: Add automake, autoconf, libtool, pkg-config. --- gnu/packages/astronomy.scm | 57 ++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4c869fc295..b5d96c932f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -900,34 +900,43 @@ (define-public splash (license license:gpl2+))) (define-public skymaker - (package - (name "skymaker") - (version "3.10.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/skymaker/" - "skymaker-" version ".tar.gz")) - (sha256 - (base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags + ;; XXX: No version tag availalbe in GitHub. + ;; See: https://github.com/astromatic/skymaker/issues/3 + (let ((commit "1a69c4716bdc9b5c6d4a917b0bc2dbd47635c459") + (revision "0")) + (package + (name "skymaker") + (version (git-version "3.10.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/skymaker") + (commit commit))) + (sha256 + (base32 "1vin4vgvcmqmwjdchsxnap374559rksz55xmaliawnl3qpzxn1nk")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments (list - (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") - (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) - (inputs - `(("fftw" ,fftwf))) - (home-page "https://www.astromatic.net/software/skymaker") - (synopsis "Astronomical image simulator") - (description - "SkyMaker is a program that simulates astronomical images. It accepts + #:configure-flags + #~(list + "CPPFLAGS=-O2 -g -fcommon" + (string-append + "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib") + (string-append + "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include")))) + (native-inputs + (list automake autoconf libtool pkg-config)) + (inputs (list fftwf)) + (home-page "https://www.astromatic.net/software/skymaker") + (synopsis "Astronomical image simulator") + (description + "SkyMaker is a program that simulates astronomical images. It accepts object lists in ASCII generated by the Stuff program to produce realistic astronomical fields. SkyMaker is part of the EFIGI (@url{https://www.astromatic.net/projects/efigi}) development project.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public stackistry (package From patchwork Sun Jun 25 21:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14338 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 3355C27BBE2; Sun, 25 Jun 2023 22:30:46 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 C933F27BBEA for ; Sun, 25 Jun 2023 22:30:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIX-0000Pb-8U; Sun, 25 Jun 2023 17:29:29 -0400 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 1qDXI8-0008P8-KF for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI8-0003qa-07 for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI7-0004qa-SQ; Sun, 25 Jun 2023 17:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 6/9] gnu: stuff: Update to 1.26.0-0.9008dc0, fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852218530 (code B ref 64287); Sun, 25 Jun 2023 21:29:03 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:42 +0000 Received: from localhost ([127.0.0.1]:43814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHl-0004oh-4J for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:42 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:45244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHd-0004nC-Ch for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:34 -0400 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-3fa96fd7a04so3319175e9.2 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728508; x=1690320508; 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=mO5ZfMODskwciCi6D6+TvFogagndYa8jLRrhZez+p1g=; b=DWCbOlrscS7gqdSIiwLbnZ8l8HU/mjVgZkpkOpDwyhQLg8MnNM8LkgFELwpiiW2y6O B+tarTKoM2vBlYrvt3bMKjS5KFGJ69iF+fExsvYsn6DVjrbaJ5WdNAf6pYyLYfthXaSG UeP2usoNN5bFVOn6X2fgGKc5Mw/QiMHsdNxL48FoZ8a12hG/asWPkujXMkKUUvGGTwmg 0US9BCIET4osbrVtG6e+7qS1hCaf9CYR5nmpJtXko24H9ENy7wptxrJkJE2lbwJ9ClVm TscRQ3YUZKhx8ZxdcAwtUyXYIODm6iikKziP/5c+Hs112I/WzrKC45nd1HZGJIy8yL6k gm3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728508; x=1690320508; 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=mO5ZfMODskwciCi6D6+TvFogagndYa8jLRrhZez+p1g=; b=ZoJypP9YS2v+dlhZY27TOspJo3Q5LYPXN8G7vaoq0n3tIRnYzKEFVEMzsLe4RgzaYX lq2Z5YKgYiu8fJVQGGBNL+mJTKR+Mh/vS8pFOKnN76wY62tLAYYd17ws3LGV48ie2XiT kLto/MBpQ09P1N5ByKSWUcIsU6fRNanpW35IrvaCu+6jTZdR7voZ6igDTX60bf4UO5xa wJmDFd9uF49Z7M8lRUKYaB3Gk07/0vtaLJTT4ibk9TZESWyWnb2HJXvtm5B447UnMTLP f3cyNySq5YVgJxGIhXbqmuHxOZogG4wjAu4lyJRjX/XhCLolpxbNfNliq4CuBQsiL63f W+lg== X-Gm-Message-State: AC+VfDzMGvqG0huIWmj9RqQ50w9dS92xsY1T1DO/rTYrqUWsKiOYMXDi xyAiruWvyIyyqPuls7K63xGDxcnN3MI= X-Google-Smtp-Source: ACHHUZ5cLojhmm783qV7+4kjLGfK3gfU6CY9utXSrb3At1sHTOlc4VQHl0bAEZ0+z0GP+aGbMthwRA== X-Received: by 2002:a1c:770a:0:b0:3fa:8c67:fc43 with SMTP id t10-20020a1c770a000000b003fa8c67fc43mr1772343wmi.32.1687728507582; Sun, 25 Jun 2023 14:28:27 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:27 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:18 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (stuff): Update to 1.26.0-0.9008dc0, fix build. [source]: Swap to 'git-checkout. [native-inputs]: Add automake, autoconf, libtool, pkg-config. --- gnu/packages/astronomy.scm | 40 +++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b5d96c932f..310a6340f5 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1068,25 +1068,33 @@ (define-public stellarium (license license:gpl2+))) (define-public stuff - (package - (name "stuff") - (version "1.26.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/stuff/" - "stuff-" version ".tar.gz")) - (sha256 - (base32 "1syibi3b86z9pikhicvkkmgxm916j732fdiw0agw0lq6z13fdcjm")))) - (build-system gnu-build-system) - (home-page "https://www.astromatic.net/software/stuff") - (synopsis "Astronomical catalogue simulation") - (description - "Stuff is a program that simulates \"perfect\" astronomical catalogues. + ;; XXX: No version tag availalbe in GitHub. + ;; See: https://github.com/astromatic/stuff/issues/6 + (let ((commit "9008dc022ef53331092da248cf0a794abd6783bf") + (revision "0")) + (package + (name "stuff") + (version (git-version "1.26.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/stuff") + (commit commit))) + (sha256 + (base32 "004sry5lqqm7s9x4l3agysp3n63y3ga35x1rwwda4m6dc6zvla6b")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + (list automake autoconf libtool pkg-config)) + (home-page "https://www.astromatic.net/software/stuff") + (synopsis "Astronomical catalogue simulation") + (description + "Stuff is a program that simulates \"perfect\" astronomical catalogues. It generates object lists in ASCII which can read by the SkyMaker program to produce realistic astronomical fields. Stuff is part of the EFIGI development project.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public swarp (package From patchwork Sun Jun 25 21:28:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14340 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 A79B427BBE9; Sun, 25 Jun 2023 22:30:55 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 CD10B27BBE2 for ; Sun, 25 Jun 2023 22:30:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIW-0000MZ-Ai; Sun, 25 Jun 2023 17:29:28 -0400 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 1qDXI8-0008PB-OX for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI8-0003qo-GH for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI8-0004ql-Bn; Sun, 25 Jun 2023 17:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 7/9] gnu: xplanet: Use G-expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852218538 (code B ref 64287); Sun, 25 Jun 2023 21:29:04 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:42 +0000 Received: from localhost ([127.0.0.1]:43816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHm-0004op-BL for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:42 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:60648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHd-0004nD-RX for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:35 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fa798cf204so43207895e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728508; x=1690320508; 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=rQlj97iviQg6+nBD40kQs+WIiXtADHLDKL1BSmmC96Q=; b=M14hscFHeYCjlmwBk6563/rx8yGKZNI6bxgZ/Zm8tJV2EQoFKPlGSQ56dZ5xw/WXr2 1gQtpbze0zleC/PR0sBNJCW5RyqtQ11Y0Hx0MpU1iRH+3mY7i5rhThRZxFUW9oSRr45s sAzw+mg2JarZeQw+ZHzWzps1xxHajDpNeRag2WHSm13oeMRF07ywULYgK+n8ZF68+nno vkMBBRWv4lMJ+/aQWmEenwK9L2MPRTCn32bU9rQtuDjZAzADXMB/J7gNFC6Ba3VqMuzp ry9/BbLa/zOo8roLzgyzvOgpUXwRHeHMyKz/3AZxos2tDrS2hybenbscgLfQN1Q2THF6 qSuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728508; x=1690320508; 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=rQlj97iviQg6+nBD40kQs+WIiXtADHLDKL1BSmmC96Q=; b=ReID8WpD+/jsE3w/WIeNe4RI7Kb7sQw0Fs+z2hlcebkHiEOrvsGxbMCNR3kMxuFd+q i2drVyr4gH2d4igXeNQhn/ZRzl5PqMw9PpXisDJseZ05tUR5j0WGJ3L4hWfOsjdn5QLN b1vNspIB5VeIIrU5EHcm7tZB7iGEiSN1CY34UxsXZO2eKEta47CgCJMcisxdUpXb8Akv OwQSCYNjaFMKqXwvfjr13nFGH7xybNsVcVOExTq+u6r0evjpUp07BiII+o3rb2Jnp6HB AtXdhz2SB6W2qgHyL2/vT7Po/wBfNG+la0in+tET0SlmLftn3CNPUPLEhT1fL07yQV31 RtJw== X-Gm-Message-State: AC+VfDy2y1ccvd0IeQTACl9ZH+18mca5ceC/+ycrCGak2/rd60HGODHV EKrISd+1lf+jzyO5iSg7lU934vpAZcM= X-Google-Smtp-Source: ACHHUZ6+86cIDbAJ4h5co5Enbv+5+kEsqdoXomzI9M0IPvCtEKfyUvagqUPZPdvkxnxU4g0xxQnIPQ== X-Received: by 2002:a1c:f603:0:b0:3f8:f80e:7b64 with SMTP id w3-20020a1cf603000000b003f8f80e7b64mr30259825wmc.17.1687728508251; Sun, 25 Jun 2023 14:28:28 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:27 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:19 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (xplanet): Use G-expressions, improve package style. [inputs]: Remove labels. --- gnu/packages/astronomy.scm | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 310a6340f5..b212f4614f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2720,28 +2720,29 @@ (define-public xplanet "xplanet-1.3.1-libimage_gif.c.patch" "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; no nasa jpl cspice support + "--without-cspice" + ;; Give correct path for pnm.h header to configure script + (string-append + "CPPFLAGS=-I" #$(this-package-input "netpbm") "/include/netpbm")))) (native-inputs (list pkg-config)) (inputs - `(("libx11" ,libx11) - ("libxscrnsaver" ,libxscrnsaver) - ("libice" ,libice) - ("freetype" ,freetype) - ("pango" ,pango) - ("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("netpbm" ,netpbm) - ("zlib" ,zlib))) - (arguments - `(#:configure-flags - (let ((netpbm (assoc-ref %build-inputs "netpbm"))) - (append (list - ;; Give correct path for pnm.h header to configure script - (string-append "CPPFLAGS=-I" netpbm "/include/netpbm") - ;; no nasa jpl cspice support - "--without-cspice" ))))) + (list libx11 + freetype + giflib + libice + libjpeg-turbo + libpng + libtiff + libxscrnsaver + netpbm + pango + zlib)) (home-page "https://xplanet.sourceforge.net/") (synopsis "Planetary body renderer") (description From patchwork Sun Jun 25 21:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14335 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 C435C27BBE9; Sun, 25 Jun 2023 22:30:25 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 29C9E27BBE2 for ; Sun, 25 Jun 2023 22:30:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIP-0008VY-1Z; Sun, 25 Jun 2023 17:29:23 -0400 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 1qDXI9-0008PD-LG for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI9-0003qx-Cp for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI9-0004r4-8W; Sun, 25 Jun 2023 17:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 8/9] gnu: celestia: Update to 1.6.3. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772853918575 (code B ref 64287); Sun, 25 Jun 2023 21:29:05 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:59 +0000 Received: from localhost ([127.0.0.1]:43820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXI2-0004pX-BH for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:58 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:57371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHe-0004nF-V8 for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:43 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3f90b8ace97so38821205e9.2 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728509; x=1690320509; 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=+9Ig/1FwDUgoJxK6DWLoyIjC1skmh53iGUreU3DdKSI=; b=ppELIAjA6Y/AKJ7/MDLslFRYwmmFWSi4fiifjVHj5vueTNl4qnDjEuIaSfmi+Fv+mH TUcBU7512g1Po72Ih7xGTfGtPJPuJ1uvij7xYoPJV4c3uYfwj2xvQRRU+Nqyu5dbyX74 bDHLggYcfI5Guda/a4kkaODxurMxRpbeaavokb17emu+TRUFc6+D9fv6yf0n654PigRr M7upULeB7xkpZwR6hjGwyWChqS064GfzAVL0j/4L6DH9A8YwRxfQOybCbkz/47ESNEXf D/TYunmvRxeq7AyXnue8JFaW7uPTuWWS74jIldXjMCrkaIW/EXoKDJ8hPq9MpCC5/v5w iQtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728509; x=1690320509; 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=+9Ig/1FwDUgoJxK6DWLoyIjC1skmh53iGUreU3DdKSI=; b=XOvkyGVzzVpwL0My0XUcx1nvanJQ9eR0ybrRy1OkNiNU60hCVseb5GYjkDtQFZJmCL mpDSpeeWToQ908GxE/hcgRak3bXHCHB8Ko2X/J05gQE8YFYIYrVfkt2o4NY9Z1/632Hg kv1McIUaQIhhCknEh2R0sSYUCzmZ3VwEG6YdrYdbJJJNqAqrwWZyHI2u9O2zctbApXHJ 6ZYcc6VjKnGVEk10YFy2Td/jz6Y8Nxpb4cvisdFIJWfEFSEp1kPhbGRDBTqBYZ4KXM6Z wD20ENq9ekaxOIur/hrNf62/kaHIWVEUVmyhkVTp+xyCF2ifzfskxsZ5G9vYTbhlAHG6 Hgww== X-Gm-Message-State: AC+VfDzFlJbnwkSjTuGWgTdHfQck4+FGMp2g0OL8V5gz6/6A9PYvTgx7 94rTZVyVH+s5ZiJ47Pz34dz6GPJGDS0= X-Google-Smtp-Source: ACHHUZ5kTg3ERFZgoNNgnDq60Q2g3+exDHwUvtlAFhsKnMHumH8xXM2kp+pOkcqh2B5WG9dIOLymNw== X-Received: by 2002:a1c:6a12:0:b0:3fa:934c:8356 with SMTP id f18-20020a1c6a12000000b003fa934c8356mr1474252wmc.10.1687728508955; Sun, 25 Jun 2023 14:28:28 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:28 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:20 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (celestia): Update to 1.6.3, improve package style. [build-system]: Swap to 'gnu-build-system as versioned tag does not contain Cmake build files. [arguments]: Use G-expressions, update configure-flags to be compatible with autoconf. [native-inputs]: Remove labels. Add autoconf, automake. [inputs]: Remove labels. Remove eigen, fmt-7, glew. --- gnu/packages/astronomy.scm | 91 ++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b212f4614f..af75d493f6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1129,54 +1129,59 @@ (define-public swarp (license license:gpl3+))) (define-public celestia - (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) - (package - (name "celestia") - (version (git-version "1.6.1" "815" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/celestiaproject/celestia") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78")))) - (build-system cmake-build-system) - (native-inputs - `(("perl" ,perl) - ("libgit2" ,libgit2) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool) - ("gettext" ,gettext-minimal))) - (inputs - `(("glu" ,glu) - ("glew" ,glew) - ("libtheora" ,libtheora) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ;; maybe required? - ("mesa" ,mesa) - ;; optional: fmtlib, Eigen3; - ("fmt" ,fmt-7) - ("eigen" ,eigen) - ;; glut: for glut interface - ("freeglut" ,freeglut))) - (propagated-inputs - (list lua)) - (arguments - `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF") - #:tests? #f)) ;no tests - (home-page "https://celestia.space/") - (synopsis "Real-time 3D visualization of space") - (description - "This simulation program lets you explore our universe in three + (package + (name "celestia") + (version "1.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/celestiaproject/celestia") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dzci5n7gcnm1vq916gsn9zddkhbzhbsakqxrpnmvzibsqznn6c8")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Make sure it detects the Lua's version packed in Guix. + ;; Review this part to support current default version of Lua in Guix. + (substitute* "configure.ac" + (("lua5.3") "lua-5.3")))))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "--with-glut" + (string-append "--with-lua=" #$(this-package-input "lua"))))) + (native-inputs + (list autoconf + automake + gettext-minimal + libgit2 + libtool + perl + pkg-config)) + (inputs + (list freeglut + glu + libjpeg-turbo + libpng + libtheora + mesa)) + (propagated-inputs + (list lua)) + (home-page "https://celestia.space/") + (synopsis "Real-time 3D visualization of space") + (description + "This simulation program lets you explore our universe in three dimensions. Celestia simulates many different types of celestial objects. From planets and moons to star clusters and galaxies, you can visit every object in the expandable database and view it from any point in space and time. The position and movement of solar system objects is calculated accurately in real time at any rate desired.") - (license license:gpl2+)))) + (license license:gpl2+))) + (define-public celestia-gtk (package From patchwork Sun Jun 25 21:28:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 14333 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 C319127BBEA; Sun, 25 Jun 2023 22:29:44 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 0A49127BBE2 for ; Sun, 25 Jun 2023 22:29:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIY-0000UF-Ob; Sun, 25 Jun 2023 17:29:30 -0400 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 1qDXIA-0008PF-4P for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI9-0003r8-SA for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI8-0004qw-RU; Sun, 25 Jun 2023 17:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 9/9] gnu: celestia-gtk: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852318544 (code B ref 64287); Sun, 25 Jun 2023 21:29:04 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:43 +0000 Received: from localhost ([127.0.0.1]:43818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHm-0004ox-Mp for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:43 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:42094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHf-0004nG-Bk for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:35 -0400 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3fa79605a3bso21716805e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728509; x=1690320509; 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=fMe1sarz8VFh3s/sAKiwEOGBYKyQBzUSTY9QpTMqxrw=; b=ObidDPTGvY6hcBjzCdVAtICrkWH8q5yIJrp+CL1gltT4esXmS+9EMkLkiuk8ouP/Ai iUS1/x4A37ANMSH5kgd3yWWCTnGET9vLnwP+Q5InEErN9da8ZpCan3oPQ5am9CGT5UHI sB+kqBnF+J7zh5K8r+9cWBmxqO/7XPhf8IIpKihSdrO6EdaoDTfdjDuCk5RXB7Ugm/u8 nPNrgfBJyJ+rvwgfpeHft/+lnUBWMgk8cWXL5Cs8sI1I6d2S+DKXWrYS+34MtHHcqZgg AsY5CjsKoCOt3wlThdzpW7bXcRrx1ybwOhJ2zU612D7frFFStsz1WHQTmUd6xHmnf5NY Yf5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728509; x=1690320509; 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=fMe1sarz8VFh3s/sAKiwEOGBYKyQBzUSTY9QpTMqxrw=; b=fp4SS5oRMDNZDGUFAt+kc8x6Z8XubCOmGV4plhaE3OJiR7vi2UncHyof+h0KEqil7X WjMq7Om0vH+HMWOtVStBrz1/TnnvTyUufwmR/nrzvHj2eBK41mhCzkRV86EROXa2LIok CG34gkIJOWguUDqC300hXtxSy+cjVwcAGdCZRVXkfcatJKeV1NPntJlssrS2rcmt0Rwo /xWG8UecB6ZBiuDEhguLSAc4JiZTsz8hr51oCsdLzsYxDG6vOTmRReyOKJPC4XpsAVOP 0AZ3PNGwyiwd17X7zaDd0HZQjgw8gsrMAq9O+txTJaqc+yOzeefoce3A0+Pp0vGvG73H YJgg== X-Gm-Message-State: AC+VfDxA5jQnfd/iaub/Pm8irlb1J4GS8K2fL6CWo7yZddMDCEzA9zEL VBDpi8TDzdHbsQFEav3KmNBW6kKOZjo= X-Google-Smtp-Source: ACHHUZ65fJ8nlkJPFBBLnaI0nvMvpTjikWL9VzcfmVXgaPagthvDIRD0XRs3bGydyUxS5XhvoY6+aw== X-Received: by 2002:a1c:f616:0:b0:3f6:d90:3db with SMTP id w22-20020a1cf616000000b003f60d9003dbmr24529510wmc.3.1687728509650; Sun, 25 Jun 2023 14:28:29 -0700 (PDT) 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 o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:29 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Message-Id: <76b42eb0eea478c61da9215fc5b2e1b7fa1c078d.1687727967.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (celestia-gtk): Fix build. Use (package/inherit ...) over (inherit ...), see https://issues.guix.gnu.org/issue/61674/raw/11. [arguments]: Use G-expressions. [inputs]: Swap to (modify-inputs ...) procedure. Add cairo, libxmu, libtheora, pango-1.42. --- gnu/packages/astronomy.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index af75d493f6..ca32ad8950 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1182,18 +1182,21 @@ (define-public celestia accurately in real time at any rate desired.") (license license:gpl2+))) - (define-public celestia-gtk - (package - (inherit celestia) + (package/inherit celestia (name "celestia-gtk") - (inputs - (append (alist-delete "freeglut" (package-inputs celestia)) - `(("gtk2" ,gtk+-2) - ("gtkglext" ,gtkglext)))) (arguments - `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF") - #:tests? #f)))) + (list + #:configure-flags + #~(list "--enable-cairo" + "--enable-theora" + "--with-gtk" + (string-append "--with-lua=" #$(this-package-input "lua"))))) + (inputs + (modify-inputs (package-inputs celestia) + (replace "freeglut" gtk+-2) + (prepend cairo gtkglext libxmu libtheora pango-1.42))) + (synopsis "GTK+ build for the Celestia package."))) (define-public python-astropy (package