From: Greg Hogan <code@greghogan.com>
To: 63449@debbugs.gnu.org
Cc: Greg Hogan <code@greghogan.com>
Subject: [bug#63449] [PATCH 3/3] gnu: f3d: Update to 2.0.0.
Date: Thu, 11 May 2023 19:41:37 +0000 [thread overview]
Message-ID: <20230511194137.821374-3-code@greghogan.com> (raw)
In-Reply-To: <20230511194137.821374-1-code@greghogan.com>
* 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 <cxxopts.hpp>")
(("^#include \"json\\.hpp\"")
+ "#include <nlohmann/json.hpp>")
+ (("cxxopts::OptionException")
+ "cxxopts::exceptions::parsing"))
+ (substitute* "library/src/engine.cxx"
+ (("^#include <json\\.hpp>")
"#include <nlohmann/json.hpp>"))))))
(build-system cmake-build-system)
;; The package cannot easily be split into out and lib outputs because
--
2.40.1
next prev parent reply other threads:[~2023-05-11 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-11 19:39 [bug#63449] [PATCH 0/3] Update cxxopts Greg Hogan
2023-05-11 19:41 ` [bug#63449] [PATCH 1/3] gnu: cxxopts: Update to 3.1.1 Greg Hogan
2023-05-11 19:41 ` [bug#63449] [PATCH 2/3] gnu: discregrid: Fix for dependent updates Greg Hogan
2023-05-11 19:41 ` Greg Hogan [this message]
2023-05-18 18:00 ` bug#63449: [PATCH 0/3] Update cxxopts Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230511194137.821374-3-code@greghogan.com \
--to=code@greghogan.com \
--cc=63449@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).