[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/12: gnu: jsoncpp: Update to 1.9.2.
From: |
guix-commits |
Subject: |
05/12: gnu: jsoncpp: Update to 1.9.2. |
Date: |
Thu, 21 Nov 2019 16:44:05 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit d9580a26c7ad9638fee4282c24db8f48ec8f6fec
Author: Marius Bakke <address@hidden>
Date: Thu Nov 21 15:31:14 2019 +0100
gnu: jsoncpp: Update to 1.9.2.
* gnu/packages/serialization.scm (jsoncpp): Update to 1.9.2.
* gnu/packages/games.scm (minetest)[source](snippet): Add substitution.
---
gnu/packages/games.scm | 10 +++++++++-
gnu/packages/serialization.scm | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a072564..3d825cb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1890,7 +1890,15 @@ match, cannon keep, and grave-itation pit.")
(modules '((guix build utils)))
(snippet
'(begin
- (delete-file-recursively "lib") #t))))
+ ;; Mimic upstream commit 706b6aad06, for compatibility with
+ ;; newer jsoncpp. Remove this for > 5.1.0.
+ (substitute* "cmake/Modules/FindJson.cmake"
+ (("features\\.h")
+ "allocator.h"))
+
+ ;; Delete bundled libraries.
+ (delete-file-recursively "lib")
+ #t))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 2bd1872..00a8d27 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -283,7 +283,7 @@ that implements both the msgpack and msgpack-rpc
specifications.")
(define-public jsoncpp
(package
(name "jsoncpp")
- (version "1.9.1")
+ (version "1.9.2")
(home-page "https://github.com/open-source-parsers/jsoncpp")
(source (origin
(method git-fetch)
@@ -291,7 +291,7 @@ that implements both the msgpack and msgpack-rpc
specifications.")
(file-name (git-file-name name version))
(sha256
(base32
- "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj"))))
+ "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES")))
- branch master updated (8da527d -> a31b9da), guix-commits, 2019/11/21
- 06/12: gnu: libseccomp: Update to 2.4.2., guix-commits, 2019/11/21
- 02/12: gnu: ungoogled-chromium: Update to 78.0.3904.108-0.8f06513 [security fixes]., guix-commits, 2019/11/21
- 05/12: gnu: jsoncpp: Update to 1.9.2.,
guix-commits <=
- 10/12: gnu: Add emacs-openwith., guix-commits, 2019/11/21
- 01/12: gnu: ungoogled-chromium: Increase resource limits in separate phase., guix-commits, 2019/11/21
- 03/12: gnu: minetest: Adjust indentation., guix-commits, 2019/11/21
- 04/12: gnu: json-modern-cxx: Update to 3.7.3., guix-commits, 2019/11/21
- 08/12: gnu: qemu: Update to 4.1.1., guix-commits, 2019/11/21
- 09/12: gnu: lxc: Adjust for GCC 7., guix-commits, 2019/11/21
- 11/12: gnu: monero: Update to 0.15.0.1., guix-commits, 2019/11/21
- 07/12: gnu: nginx: Update to 1.17.6., guix-commits, 2019/11/21
- 12/12: gnu: monero-gui: Update to 0.15.0.1., guix-commits, 2019/11/21