[bug#63449] [PATCH 0/3] Update cxxopts.

[bug#63449] [PATCH 0/3] Update cxxopts.

[Greg Hogan]

Greg Hogan (3):
  gnu: cxxopts: Update to 3.1.1.
  gnu: discregrid: Fix for dependent updates.
  gnu: f3d: Update to 2.0.0.

 gnu/packages/cpp.scm      |  4 ++--
 gnu/packages/graphics.scm | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

-- 
2.40.1

[bug#63449] [PATCH 1/3] gnu: cxxopts: Update to 3.1.1.

[Greg Hogan]

* gnu/packages/cpp.scm (cxxopts): Update to 3.1.1.
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ef1a22c4c0..2ab850e2ff 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1188,7 +1188,7 @@ (define-public psascan
 (define-public cxxopts
   (package
     (name "cxxopts")
-    (version "3.0.0")
+    (version "3.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1197,7 +1197,7 @@ (define-public cxxopts
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"))))
+                "0d37qpsaq8ik7pl4vk8346vqcqyfzfbnpq8mhsa2gb2zf1lwr4wl"))))
     (build-system cmake-build-system)
     (synopsis "Lightweight C++ command line option parser")
     (description
-- 
2.40.1

[bug#63449] [PATCH 2/3] gnu: discregrid: Fix for dependent updates.

[Greg Hogan]

* gnu/packages/graphics.scm (discregrid)[source]: Add patch for breaking
change to cxxopts.
---
 gnu/packages/graphics.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 261fcf9547..8aff3b075e 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2328,7 +2328,9 @@ (define-public discregrid
                              "cmd/generate_density_map/main.cpp"
                              "cmd/generate_sdf/main.cpp")
                 (("^#include <cxxopts/cxxopts\\.hpp>")
-                 "#include <cxxopts.hpp>"))))))
+                 "#include <cxxopts.hpp>")
+                (("cxxopts::OptionException")
+                 "cxxopts::exceptions::parsing"))))))
       (build-system cmake-build-system)
       (outputs '("out" "bin"))
       (arguments
-- 
2.40.1

[bug#63449] [PATCH 3/3] gnu: f3d: Update to 2.0.0.

[Greg Hogan]

* 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

bug#63449: [PATCH 0/3] Update cxxopts.

[Ludovic Courtès]

Hi,

Greg Hogan <code@greghogan.com> skribis:

>   gnu: cxxopts: Update to 3.1.1.
>   gnu: discregrid: Fix for dependent updates.
>   gnu: f3d: Update to 2.0.0.

Applied, thanks!

Ludo’.