From: Martin Becze <mjbecze@riseup.net>
To: 44432@debbugs.gnu.org
Cc: Martin Becze <mjbecze@riseup.net>
Subject: [bug#44432] [PATCH 1/3] gnu: jsoncpp: Update to 1.9.4
Date: Wed, 4 Nov 2020 06:29:26 -0600 [thread overview]
Message-ID: <20201104122928.30408-2-mjbecze@riseup.net> (raw)
In-Reply-To: <20201104122928.30408-1-mjbecze@riseup.net>
* gnu/packages/serialization.scm (jsoncpp): Update to 1.9.4.
* gnu/packages/patches/jsoncpp-fix-inverted-case.patch: Removed old patch.
* gnu/local.mk (dist_patch_DATA): Remove old patch.
---
gnu/local.mk | 1 -
.../patches/jsoncpp-fix-inverted-case.patch | 22 -------------------
gnu/packages/serialization.scm | 6 ++---
3 files changed, 3 insertions(+), 26 deletions(-)
delete mode 100644 gnu/packages/patches/jsoncpp-fix-inverted-case.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d4d04c01b8..08a82c45f1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1180,7 +1180,6 @@ dist_patch_DATA = \
%D%/packages/patches/java-xerces-xjavac_taskdef.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/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.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
deleted file mode 100644
index e4897de1b8..0000000000
--- a/gnu/packages/patches/jsoncpp-fix-inverted-case.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 fc0102caf0..86f6ac6a1c 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -285,16 +286,15 @@ that implements both the msgpack and msgpack-rpc specifications.")
(define-public jsoncpp
(package
(name "jsoncpp")
- (version "1.9.2")
+ (version "1.9.4")
(home-page "https://github.com/open-source-parsers/jsoncpp")
(source (origin
(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"))))
+ "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
--
2.29.1
next prev parent reply other threads:[~2020-11-04 12:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 12:29 [bug#44433] [PATCH 0/3] gnu: Add solidity Martin Becze
2020-11-04 12:29 ` Martin Becze [this message]
2020-11-05 14:04 ` bug#44432: close Martin Becze
2020-11-04 12:29 ` [bug#44431] [PATCH 2/3] gnu: z3: Update to 4.8.9 Martin Becze
2020-11-05 14:05 ` bug#44431: close Martin Becze
2020-11-04 12:29 ` [bug#44434] [PATCH 3/3] gnu: Add solidity Martin Becze
2020-11-05 14:03 ` bug#44434: closing Martin Becze
2020-11-05 13:59 ` [bug#44433] [PATCH 1/3] gnu: jsoncpp: Update to 1.9.4 Martin Becze
2020-11-05 13:59 ` [bug#44433] [PATCH 2/3] gnu: z3: Update to 4.8.9 Martin Becze
2020-11-05 13:59 ` [bug#44433] [PATCH 3/3] gnu: Add solidity Martin Becze
2020-11-18 8:22 ` Christopher Baines
2020-11-16 22:56 ` [bug#44433] [PATCH 0/3] " Christopher Baines
2020-11-18 8:17 ` bug#44433: " Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104122928.30408-2-mjbecze@riseup.net \
--to=mjbecze@riseup.net \
--cc=44432@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).