From patchwork Thu May 11 19:41:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 49944 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 D8B7A27BBF1; Thu, 11 May 2023 20:42:31 +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 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 4A17627BBEE for ; Thu, 11 May 2023 20:42:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxCAv-0004Vy-Lp; Thu, 11 May 2023 15:42:05 -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 1pxCAt-0004VS-CL for guix-patches@gnu.org; Thu, 11 May 2023 15:42:03 -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 1pxCAt-0008Uo-4M for guix-patches@gnu.org; Thu, 11 May 2023 15:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxCAs-0003Mv-Ph for guix-patches@gnu.org; Thu, 11 May 2023 15:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63449] [PATCH 3/3] gnu: f3d: Update to 2.0.0. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2023 19:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63449@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63449-submit@debbugs.gnu.org id=B63449.168383411212917 (code B ref 63449); Thu, 11 May 2023 19:42:02 +0000 Received: (at 63449) by debbugs.gnu.org; 11 May 2023 19:41:52 +0000 Received: from localhost ([127.0.0.1]:53395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxCAh-0003MH-Jf for submit@debbugs.gnu.org; Thu, 11 May 2023 15:41:51 -0400 Received: from mail-yw1-f169.google.com ([209.85.128.169]:48287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxCAd-0003Ld-IS for 63449@debbugs.gnu.org; Thu, 11 May 2023 15:41:47 -0400 Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-55a2691637bso134682937b3.0 for <63449@debbugs.gnu.org>; Thu, 11 May 2023 12:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1683834102; x=1686426102; 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=6nrh4MBoS/mH4dPQj4NL4iZTWw4WmYx+SaIiZOEx+I8=; b=r7s1Xo1EFcghkBFEVYr95FSnyGSCt+0cQSJQRZxNYrDAmhpOtrZjjrjn/HjP7N7p5x gVm1YEF9QRow1pOBDQ0C4igaUhI09N4onaaeCkaI9y04SC0xiu0QhwdH6zCwZBJcBsoI W8187/JhVH4E7Wc65reAI1hgUt+Mmoxd2hRBhJD9iyQrLvLaoKvXNqkC6jhxD3iW14G0 Zg5/RaXZl6sbU3VCjgXeIY3G4q22aczsyIhCnEwA/kleCNeg0jLPAR3rS45OyIrnElgU xV4DdwO4SnpTMlmqoxAETCilwImF5NaXon/UMcqQbes1rEEHM7Gm/vPPd4lzRjNSHxPo B9FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683834102; x=1686426102; 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=6nrh4MBoS/mH4dPQj4NL4iZTWw4WmYx+SaIiZOEx+I8=; b=jA+Za+gxTpJ0tFs1aO3QHiFZUPZovHT2liXNXFo9gQKoL8rv/qO0JW5czAUoVSgIHb CFG4veOBXcLoiwWQHV5sazW+oviOaLMwuDoBhGBRzIaaW0+6Q1bx8E44y3+HLvAhnKzu 6o27Ous7F3HqG7beBeGtxrbn92X7+FQrX4EbxAEcrxKJfR1RwBmdyb6OBdV1VN0KwIrd WAIuZ48TvXz5MUIkXslEKfxoS/cNtiLArJBgRcJGUXIAJEtMw9QezQDJzzXxWs3W2URG cSJ5dxVO3XWKqejkoCyv5Wd3++lQPcMc+8oQC7HPw9ODFAsSAJVWJOJJnkxk0ltrzkNr KAig== X-Gm-Message-State: AC+VfDyNoaVFDPDFwnyoq9pajbBySxygc65gZQi5gQOole97H9yFYqE9 xnCvvNV0zyIj/nng9T/iaayh78EYzwbStIVK5hsmVw== X-Google-Smtp-Source: ACHHUZ52tUZP3x27lEMoab3jT+ynSyt1KgebdoLPW7nvbiu/mQY/ZI8HioWc51cwDC8MGIDk/NE8ng== X-Received: by 2002:a0d:d487:0:b0:55a:5dce:aa19 with SMTP id w129-20020a0dd487000000b0055a5dceaa19mr22610714ywd.51.1683834101799; Thu, 11 May 2023 12:41:41 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-117-196-55.us-east-2.compute.amazonaws.com. [18.117.196.55]) by smtp.gmail.com with ESMTPSA id n82-20020a0dcb55000000b00559be540b56sm5173971ywd.134.2023.05.11.12.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 12:41:41 -0700 (PDT) From: Greg Hogan Date: Thu, 11 May 2023 19:41:37 +0000 Message-Id: <20230511194137.821374-3-code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511194137.821374-1-code@greghogan.com> References: <20230511194137.821374-1-code@greghogan.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (f3d): Update to 2.0.0. [source]: Update substitute paths and add patch for breaking change to cxxopts. --- gnu/packages/graphics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8aff3b075e..6f2d8f7fa0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2483,7 +2483,7 @@ (define-public mmg (define-public f3d (package (name "f3d") - (version "1.3.1") + (version "2.0.0") (source (origin (method git-fetch) @@ -2492,16 +2492,21 @@ (define-public f3d (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hdfgwf5d24ykab634xg4vv9r09nh96ss7hhnqnh5nmw4abhxzg7")) + (base32 "1gcwpdkz3ylaxi133zri1cxkvj6za5s1hbgqqc8fn10q2dkkdd44")) (modules '((guix build utils))) (snippet #~(begin - (delete-file "application/cxxopts.hpp") - (delete-file "application/json.hpp") + (delete-file "external/cxxopts.hpp") + (delete-file "external/json.hpp") (substitute* "application/F3DOptionsParser.cxx" (("^#include \"cxxopts\\.hpp\"") "#include ") (("^#include \"json\\.hpp\"") + "#include ") + (("cxxopts::OptionException") + "cxxopts::exceptions::parsing")) + (substitute* "library/src/engine.cxx" + (("^#include ") "#include ")))))) (build-system cmake-build-system) ;; The package cannot easily be split into out and lib outputs because