ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: jsoncpp: Update to 1.9.5.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2022-06-26 11:27:41 +02:00
parent 1d221b7fea
commit ca934bb410
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -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 \

24
gnu/packages/patches/jsoncpp-pkg-config-version.patch
View file

@ -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}

6
gnu/packages/serialization.scm
View file

@ -414,17 +414,15 @@ (define-public yaml-cpp
(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"