[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: jsoncpp: Fix test failure on armhf-linux and aarch64-linux.
From: |
guix-commits |
Subject: |
02/07: gnu: jsoncpp: Fix test failure on armhf-linux and aarch64-linux. |
Date: |
Sun, 12 Jan 2020 14:34:12 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 11f87d635ce73f7d69ed4b1bdca77df1a7406eb5
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Jan 12 18:46:40 2020 +0100
gnu: jsoncpp: Fix test failure on armhf-linux and aarch64-linux.
* gnu/packages/patches/jsoncpp-fix-inverted-case.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/serialization.scm (jsoncpp)[source](patches): New field.
---
gnu/local.mk | 1 +
.../patches/jsoncpp-fix-inverted-case.patch | 22 ++++++++++++++++++++++
gnu/packages/serialization.scm | 1 +
3 files changed, 24 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 33cf439..aa61799 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1030,6 +1030,7 @@ dist_patch_DATA =
\
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
+ %D%/packages/patches/jsoncpp-fix-inverted-case.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
diff --git a/gnu/packages/patches/jsoncpp-fix-inverted-case.patch
b/gnu/packages/patches/jsoncpp-fix-inverted-case.patch
new file mode 100644
index 0000000..e4897de
--- /dev/null
+++ b/gnu/packages/patches/jsoncpp-fix-inverted-case.patch
@@ -0,0 +1,22 @@
+This patch fixes a bug and related test failure on platforms where 'char'
+is unsigned.
+
+Taken from upstream:
+https://github.com/open-source-parsers/jsoncpp/commit/f11611c8785082ead760494cba06196f14a06dcb
+
+diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
+index 8e06cca2..56195dc1 100644
+--- a/src/lib_json/json_writer.cpp
++++ b/src/lib_json/json_writer.cpp
+@@ -178,8 +178,9 @@ static bool isAnyCharRequiredQuoting(char const* s, size_t
n) {
+
+ char const* const end = s + n;
+ for (char const* cur = s; cur < end; ++cur) {
+- if (*cur == '\\' || *cur == '\"' || *cur < ' ' ||
+- static_cast<unsigned char>(*cur) < 0x80)
++ if (*cur == '\\' || *cur == '\"' ||
++ static_cast<unsigned char>(*cur) < ' ' ||
++ static_cast<unsigned char>(*cur) >= 0x80)
+ return true;
+ }
+ return false;
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index cf80237..72cc70e 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -290,6 +290,7 @@ that implements both the msgpack and msgpack-rpc
specifications.")
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
+ (patches (search-patches "jsoncpp-fix-inverted-case.patch"))
(sha256
(base32
"037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"))))
- branch master updated (cfd0fd9 -> 2e4bb89), guix-commits, 2020/01/12
- 01/07: gnu: chez-scheme: Remove obsolete snippet., guix-commits, 2020/01/12
- 04/07: gnu: wavpack: Do not build the static library., guix-commits, 2020/01/12
- 05/07: gnu: gst-plugins-base: Do not propagate Orc on armhf systems., guix-commits, 2020/01/12
- 06/07: gnu: nss-certs: Update to 3.48., guix-commits, 2020/01/12
- 02/07: gnu: jsoncpp: Fix test failure on armhf-linux and aarch64-linux.,
guix-commits <=
- 03/07: gnu: wavpack: Update to 5.2.0., guix-commits, 2020/01/12
- 07/07: gnu: xdg-utils: Don't use propagated inputs., guix-commits, 2020/01/12