[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
148/201: gnu: jsoncpp: Apply patch to regular package.
From: |
guix-commits |
Subject: |
148/201: gnu: jsoncpp: Apply patch to regular package. |
Date: |
Mon, 1 Nov 2021 23:19:04 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit ea83e2d5fe755ec5e17a9a82c05124b7497b8498
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Oct 21 20:24:51 2021 -0400
gnu: jsoncpp: Apply patch to regular package.
* gnu/packages/serialization.scm (jsoncpp)[source]: Apply patch.
(jsoncpp-with-pkg-version): Delete variant package.
* gnu/packages/jami.scm (libring)[inputs]: Adjust accordingly.
---
gnu/packages/jami.scm | 2 +-
gnu/packages/serialization.scm | 21 ++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 7d71837..5cb9284 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -422,7 +422,7 @@
("eudev" ,eudev)
("ffmpeg" ,ffmpeg-jami)
("jack" ,jack-1)
- ("jsoncpp" ,jsoncpp-with-pkg-version)
+ ("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
("libgit2" ,libgit2)
("libnatpmp" ,libnatpmp)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index dc21dba..4501dfb 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -425,6 +425,8 @@ in which the loaded data is arranged in memory.")
(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"))))
@@ -444,25 +446,6 @@ 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.
- 100/201: gnu: python-pytest-6: Fix version via setuptools-scm., (continued)
- 100/201: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/11/01
- 104/201: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/11/01
- 98/201: gnu: Add python-tomli., guix-commits, 2021/11/01
- 101/201: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/11/01
- 109/201: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/11/01
- 113/201: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/01
- 127/201: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/01
- 116/201: gnu: mesa: Update to 21.2.4., guix-commits, 2021/11/01
- 137/201: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/01
- 143/201: gnu: elogind: Update to 246.10., guix-commits, 2021/11/01
- 148/201: gnu: jsoncpp: Apply patch to regular package.,
guix-commits <=
- 154/201: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/11/01
- 161/201: gnu: mesa: Enable support for OpenGL ES 1.1 and 2.0., guix-commits, 2021/11/01
- 177/201: gnu: xorg-server, xorg-server-for-tests: Update to 21.1.0., guix-commits, 2021/11/01
- 188/201: gnu: gnome-online-accounts: Update to 3.43.1., guix-commits, 2021/11/01
- 194/201: gnu: docker-compose: Update to 1.29.2., guix-commits, 2021/11/01
- 73/201: bluez: Update to 5.61., guix-commits, 2021/11/01
- 80/201: gnu: diffutils: Update to 3.8., guix-commits, 2021/11/01
- 84/201: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/11/01
- 88/201: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/01
- 93/201: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/11/01