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