diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-26 11:27:41 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-26 12:06:31 +0200 |
| commit | ca934bb410233d98b062d124bbc6daf7296b1a41 (patch) | |
| tree | d2c355daab6ccdf4fcc2cb05a725d733ee10de42 /gnu | |
| parent | 1d221b7fea1985a02e6b5d2f23894f663acfadd3 (diff) | |
| download | guix-ca934bb410233d98b062d124bbc6daf7296b1a41.tar.gz guix-ca934bb410233d98b062d124bbc6daf7296b1a41.zip | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/jsoncpp-pkg-config-version.patch | 24 | ||||
| -rw-r--r-- | 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" |