[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/62: gnu: jsoncpp: Update to 1.9.5.
From: |
guix-commits |
Subject: |
54/62: gnu: jsoncpp: Update to 1.9.5. |
Date: |
Sun, 26 Jun 2022 06:09:12 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ca934bb410233d98b062d124bbc6daf7296b1a41
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 26 11:27:41 2022 +0200
gnu: jsoncpp: Update to 1.9.5.
* gnu/packages/serialization.scm (jsoncpp): Update to 1.9.5.
[source](patches): Remove.
* gnu/packages/patches/jsoncpp-pkg-config-version.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 1 -
.../patches/jsoncpp-pkg-config-version.patch | 24 ----------------------
gnu/packages/serialization.scm | 6 ++----
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b0ce741958..7e4ed0d83f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1303,7 +1303,6 @@ dist_patch_DATA =
\
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
- %D%/packages/patches/jsoncpp-pkg-config-version.patch \
%D%/packages/patches/jami-fix-crash-on-quit.patch \
%D%/packages/patches/jami-images-loading.patch \
%D%/packages/patches/jami-memory-usage.patch \
diff --git a/gnu/packages/patches/jsoncpp-pkg-config-version.patch
b/gnu/packages/patches/jsoncpp-pkg-config-version.patch
deleted file mode 100644
index 3983cc300c..0000000000
--- a/gnu/packages/patches/jsoncpp-pkg-config-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Taken from upstream:
https://github.com/open-source-parsers/jsoncpp/issues/1235.
-
-From ac2870298ed5b5a96a688d9df07461b31f83e906 Mon Sep 17 00:00:00 2001
-From: Derick Vigne <derickvigne@me.com>
-Date: Tue, 26 Jan 2021 14:59:12 -0500
-Subject: [PATCH] Fixed pkg-config Version
-
----
- pkg-config/jsoncpp.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in
-index 632a377f5..2a2221069 100644
---- a/pkg-config/jsoncpp.pc.in
-+++ b/pkg-config/jsoncpp.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir_for_pc_file@
-
- Name: jsoncpp
- Description: A C++ library for interacting with JSON
--Version: @JSONCPP_VERSION@
-+Version: @PROJECT_VERSION@
- URL: https://github.com/open-source-parsers/jsoncpp
- Libs: -L${libdir} -ljsoncpp
- Cflags: -I${includedir}
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index cec9b68299..960c339ef9 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -414,17 +414,15 @@ in which the loaded data is arranged in memory.")
(define-public jsoncpp
(package
(name "jsoncpp")
- (version "1.9.4")
+ (version "1.9.5")
(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-pkg-config-version.patch"))
(sha256
(base32
- "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))))
+ "06zss7z56ykzwcsfdxarmini63hkf8i8gx70q3yw9wb0bw7wj9rv"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
- 05/62: gnu: m4: Update to 1.4.19., (continued)
- 05/62: gnu: m4: Update to 1.4.19., guix-commits, 2022/06/26
- 18/62: gnu: libxslt: Update to 1.1.35., guix-commits, 2022/06/26
- 21/62: gnu: libXft: Remove input labels., guix-commits, 2022/06/26
- 25/62: gnu: libxcb: Remove input labels., guix-commits, 2022/06/26
- 15/62: gnu: Python: Update to 3.9.13., guix-commits, 2022/06/26
- 31/62: gnu: libmnl: Add release-monitoring-url., guix-commits, 2022/06/26
- 14/62: gnu: SQLite: Update to 3.39.0., guix-commits, 2022/06/26
- 35/62: gnu: libnftnl/fixed: Update to 1.2.2., guix-commits, 2022/06/26
- 38/62: gnu: libuv: Update to 1.44.1., guix-commits, 2022/06/26
- 52/62: gnu: libarchive: Update to 3.6.1., guix-commits, 2022/06/26
- 54/62: gnu: jsoncpp: Update to 1.9.5.,
guix-commits <=
- 55/62: gnu: libssh2: Update to 1.10.0., guix-commits, 2022/06/26
- 56/62: gnu: libssh2: Omit static library., guix-commits, 2022/06/26
- 59/62: gnu: hwdata: Update to 0.360., guix-commits, 2022/06/26
- 60/62: gnu: pciutils: Update to 3.8.0., guix-commits, 2022/06/26
- 61/62: gnu: ninja: Update to 1.11.0., guix-commits, 2022/06/26