GNU bug report logs - #65135
[PATCH 0/3] Update catch2.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65135 in the body.
You can then email your comments to 65135 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 0/3] Update catch2.
Date: Mon,  7 Aug 2023 20:10:58 +0000

Greg Hogan (3):
  gnu: catch2: Update to 3.4.0.
  gnu: spdlog: Fix tests.
  gnu: vbz-compression: Update to 1.0.3.

 gnu/local.mk                                |  1 +
 gnu/packages/bioinformatics.scm             |  4 ++--
 gnu/packages/check.scm                      |  4 ++--
 gnu/packages/logging.scm                    |  1 +
 gnu/packages/patches/spdlog-fix-tests.patch | 26 +++++++++++++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/spdlog-fix-tests.patch

-- 
2.41.0

Message #8 received at 65135 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 65135 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 1/3] gnu: catch2: Update to 3.4.0.
Date: Mon,  7 Aug 2023 20:12:33 +0000

* gnu/packages/check.scm (catch2): Update to 3.4.0.
---
 gnu/packages/check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c057bf3443..1578d3e53e 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -601,7 +601,7 @@ (define-public cbehave
 (define-public catch2-3.3
   (package
     (name "catch2")
-    (version "3.3.2")
+    (version "3.4.0")
     (home-page "https://github.com/catchorg/Catch2")
     (source (origin
               (method git-fetch)
@@ -611,7 +611,7 @@ (define-public catch2-3.3
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0m6i3lr0qk303ashjpz5vpwmxf76n5d6s8jq6r6kcy6gph525zmp"))))
+                "1gdfsva6mnd66px85fmm3s65h8qzqnmgbmws2i3nygfav1y8d88f"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #11 received at 65135 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 65135 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 2/3] gnu: spdlog: Fix tests.
Date: Mon,  7 Aug 2023 20:12:34 +0000

* gnu/packages/patches/spdlog-fix-tests.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/logging.scm (spdlog)[source]: Use patch.
---
 gnu/local.mk                                |  1 +
 gnu/packages/logging.scm                    |  1 +
 gnu/packages/patches/spdlog-fix-tests.patch | 26 +++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 gnu/packages/patches/spdlog-fix-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 77707127a7..af5eea1791 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1961,6 +1961,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/source-highlight-gcc-compat.patch	\
   %D%/packages/patches/softhsm-fix-openssl3-tests.patch		\
   %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \
+  %D%/packages/patches/spdlog-fix-tests.patch			\
   %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \
   %D%/packages/patches/sphinxbase-fix-doxygen.patch		\
   %D%/packages/patches/sssd-system-directories.patch		\
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index abeb3fdd5c..c204a013b4 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -221,6 +221,7 @@ (define-public spdlog
              (url "https://github.com/gabime/spdlog")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
+       (patches (search-patches "spdlog-fix-tests.patch"))
        (sha256
         (base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k"))))
     (build-system cmake-build-system)
diff --git a/gnu/packages/patches/spdlog-fix-tests.patch b/gnu/packages/patches/spdlog-fix-tests.patch
new file mode 100644
index 0000000000..0eaf1d485d
--- /dev/null
+++ b/gnu/packages/patches/spdlog-fix-tests.patch
@@ -0,0 +1,26 @@
+Remove after next release and package update:
+https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a
+
+From 2ee8bac78e6525a8ad9a9196e65d502ce390d83a Mon Sep 17 00:00:00 2001
+From: xvitaly <vitaly <at> easycoding.org>
+Date: Sun, 23 Jul 2023 10:15:25 +0200
+Subject: [PATCH] Added missing square bracket to fix the level_to_string_view
+ test. (#2827)
+
+---
+ tests/test_misc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp
+index 9f3cb1744..6199641ff 100644
+--- a/tests/test_misc.cpp
++++ b/tests/test_misc.cpp
+@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]")
+     REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello");
+ }
+ 
+-TEST_CASE("level_to_string_view", "[convert_to_string_view")
++TEST_CASE("level_to_string_view", "[convert_to_string_view]")
+ {
+     REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace");
+     REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug");
-- 
2.41.0

Message #14 received at 65135 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 65135 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 3/3] gnu: vbz-compression: Update to 1.0.3.
Date: Mon,  7 Aug 2023 20:12:35 +0000

* gnu/packages/bioinformatics.scm (vbz-compression): Update to 1.0.3.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b847c9a5d7..4195755bb1 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17867,7 +17867,7 @@ (define-public python-ikarus
 (define-public vbz-compression
   (package
     (name "vbz-compression")
-    (version "1.0.1")
+    (version "1.0.3")
     (source
      (origin
        (method git-fetch)
@@ -17879,7 +17879,7 @@ (define-public vbz-compression
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1c6wsrnw03vsc5cfp2rdakly5xy55m9chjmy6v685yapdwirdky0"))))
+         "1rn5d98flvjblhj4zjpcdqqh8qlgsh5cmb13i49fnm187p03097z"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.41.0

Message #17 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Greg Hogan <code <at> greghogan.com>
Cc: 65135-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#65135] [PATCH 0/3] Update catch2.
Date: Sun, 27 Aug 2023 19:55:41 +0100

[Message part 1 (text/plain, inline)]

Greg Hogan <code <at> greghogan.com> writes:

> Greg Hogan (3):
>   gnu: catch2: Update to 3.4.0.
>   gnu: spdlog: Fix tests.
>   gnu: vbz-compression: Update to 1.0.3.
>
>  gnu/local.mk                                |  1 +
>  gnu/packages/bioinformatics.scm             |  4 ++--
>  gnu/packages/check.scm                      |  4 ++--
>  gnu/packages/logging.scm                    |  1 +
>  gnu/packages/patches/spdlog-fix-tests.patch | 26 +++++++++++++++++++++
>  5 files changed, 32 insertions(+), 4 deletions(-)
>  create mode 100644 gnu/packages/patches/spdlog-fix-tests.patch

Thanks, I've pushed this to master as
37cca1d87e18c257a9697110557a2bfaf9bc684b.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.