From c1007786fdec6c749887bbd9bf8f46ff27e69055 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 11 May 2023 19:41:37 +0000 Subject: [PATCH] gnu: f3d: Update to 2.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graphics.scm (f3d): Update to 2.0.0. [source]: Update substitute paths and add patch for breaking change to cxxopts. Signed-off-by: Ludovic Courtès --- 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 fa1fcbf4d1..60db7543a6 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