[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
148/169: gnu: jsoncpp: Apply patch to regular package.
From: |
guix-commits |
Subject: |
148/169: gnu: jsoncpp: Apply patch to regular package. |
Date: |
Thu, 28 Oct 2021 02:09:05 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit cfbe8c2a1f417267223a6619f8843f887a1cd1f4
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.
- 158/169: gnu: python-dateutil: Update to 2.8.2., (continued)
- 158/169: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/10/28
- 161/169: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/10/28
- 159/169: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/10/28
- 132/169: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/28
- 145/169: gnu: mariadb: Only run the main test suite to avoid flaky tests., guix-commits, 2021/10/28
- 156/169: gnu: python-pytest: Update to 6.2.5., guix-commits, 2021/10/28
- 163/169: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/10/28
- 151/169: gnu: curl: Update to 7.79.1., guix-commits, 2021/10/28
- 157/169: gnu: python-six-bootstrap: Update to 1.16.0., guix-commits, 2021/10/28
- 147/169: gnu: nss: Update to 3.71., guix-commits, 2021/10/28
- 148/169: gnu: jsoncpp: Apply patch to regular package.,
guix-commits <=
- 150/169: gnu: gtk: Update to 4.4.0., guix-commits, 2021/10/28
- 152/169: gnu: python-hypothesis: Update to 6.23.4., guix-commits, 2021/10/28
- 154/169: gnu: boost: Update to 1.77.0., guix-commits, 2021/10/28
- 149/169: gnu: meson: Update to 0.60.0., guix-commits, 2021/10/28
- 155/169: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/10/28
- 160/169: gnu: gstreamer: Disable the pipelines-seek test., guix-commits, 2021/10/28
- 162/169: gnu: mesa: Enable support for OpenGL ES 1.1 and 2.0., guix-commits, 2021/10/28
- 164/169: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/10/28
- 165/169: gnu: gdb: Update to 11.1., guix-commits, 2021/10/28
- 166/169: gnu: ldc: Update to 1.27.1., guix-commits, 2021/10/28