diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-06 06:58:24 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-06 06:59:12 +0000 |
| commit | 03f99e14ed299c9e6fec54af6d1f4951ca3ff4f8 (patch) | |
| tree | 240db0c7d3f8294807fa7b5b1236b8a8eabf927c | |
| parent | 79fbbe5e4a7cd79613d49c0dda51872f2492cc76 (diff) | |
| download | guix-03f99e14ed299c9e6fec54af6d1f4951ca3ff4f8.tar.gz guix-03f99e14ed299c9e6fec54af6d1f4951ca3ff4f8.zip | |
gnu: Add jsoncpp-with-pkg-version.
* gnu/packages/patches/jsoncpp-pkg-config-version: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/serialization.scm (jsoncpp-with-pkg-version): New variable.
| -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 | 19 |
3 files changed, 44 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f0cfb1eee7..bfecbfa6a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1267,6 +1267,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-CVE-2020-12762.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/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ diff --git a/gnu/packages/patches/jsoncpp-pkg-config-version.patch b/gnu/packages/patches/jsoncpp-pkg-config-version.patch new file mode 100644 index 0000000000..3983cc300c --- /dev/null +++ b/gnu/packages/patches/jsoncpp-pkg-config-version.patch @@ -0,0 +1,24 @@ +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 c8dcf65905..ae2e113483 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -454,6 +454,25 @@ preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.") (license license:expat))) +;; XXX: TODO(core-updates): Remove this package and apply the patch to the +;; jsoncpp package. This patch fixes the package version declared in the +;; pkg-config file. +(define-public jsoncpp-with-pkg-version + (package + (inherit jsoncpp) + (name "jsoncpp") + (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)) + (sha256 + (base32 + "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv")) + (patches + (search-patches "jsoncpp-pkg-config-version.patch")))))) + ;; Tensorflow does not build with jsoncpp 1.8.x. It is built with commit ;; 4356d9bba191e1e16ce7a92073cbf3e63564e973, which lies between version 1.7.2 ;; and 1.7.3. |