[PATCH 0/3] Update catch2.

  • Done
  • quality assurance status badge
Details
2 participants
  • Greg Hogan
  • Christopher Baines
Owner
unassigned
Submitted by
Greg Hogan
Severity
normal
G
G
Greg Hogan wrote on 7 Aug 2023 22:10
(address . guix-patches@gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
20230807201104.42840-1-code@greghogan.com
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
G
G
Greg Hogan wrote on 7 Aug 2023 22:12
[PATCH 1/3] gnu: catch2: Update to 3.4.0.
(address . 65135@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
20230807201256.44051-1-code@greghogan.com
* gnu/packages/check.scm (catch2): Update to 3.4.0.
---
gnu/packages/check.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
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
G
G
Greg Hogan wrote on 7 Aug 2023 22:12
[PATCH 2/3] gnu: spdlog: Fix tests.
(address . 65135@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
20230807201256.44051-2-code@greghogan.com
* 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

Toggle diff (58 lines)
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@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
G
G
Greg Hogan wrote on 7 Aug 2023 22:12
[PATCH 3/3] gnu: vbz-compression: Update to 1.0.3.
(address . 65135@debbugs.gnu.org)(name . Greg Hogan)(address . code@greghogan.com)
20230807201256.44051-3-code@greghogan.com
* gnu/packages/bioinformatics.scm (vbz-compression): Update to 1.0.3.
---
gnu/packages/bioinformatics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
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
C
C
Christopher Baines wrote on 27 Aug 2023 20:55
Re: [bug#65135] [PATCH 0/3] Update catch2.
(name . Greg Hogan)(address . code@greghogan.com)
87v8d0xqkh.fsf@cbaines.net
Greg Hogan <code@greghogan.com> writes:

Toggle quote (13 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmTrnD9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XejxRAAuC+sLD5DYn/2pBu7qbTlHLbNuPureNB8
pwS3k4NAh80taI15k5U13nMD4bJ5i3UTTPC4fremCUGt1RlVsGgKb194/f9V3XC5
j8xFleGGVe+G6p8k0oIlTNdbSiYYsD57gEe35wo7JH85AzyNZn9OAXiHwXkQ1xZW
kJ6T2JL7SX3ZGhhTxj6HEGmo5jRmCprn6XBfAoIVZ0E+OGE/U1D93QwTerhfxwtn
l1q8nUaMMnTA9tHaMB1ycc2NRlUNvj+/8mDLRvBVYj38j9nPDex8ECSQP5Vt0hT+
T/8AEe667MFmZ1YEpxibi1czOO9WKkHQNqpNHKKBKvTcxp0LPUz4at9D43FpJOJt
O2o4dIKqtup/KarYf+bbYp34SPx/VUrWIdEK9fqu7Ln9u/cT/AxN6hHrXK1QWo1X
7aSgjUYLKqmVskbmPxTSa+mES0E0xPdgPB3JdgSvO8oQS8Ew/Oe9AbxeQ7hkVB3o
SKeg6Sg/snXlrXQ+ytV2/mX20fnSX1NrwZTMjD/hAdRDBFK9leBl5zVF/jOuE048
TVA9CIBjU1uNqWFro4BYYNh05iOdgqtfa4Dsfs+GDZCHNadR/NB1KPXVX65P4ECj
5DTsGAuO3JY7l+L0KCH8BCE8LBIIktt+1FaWrabZsfPuT6fTi3yExENsyvszrFwe
fc9JDBOFkYo=
=3Cg0
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 65135@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 65135
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch