[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch version-1.4.0 updated: gnu: network-manager: Patch dlopen call to
From: |
guix-commits |
Subject: |
branch version-1.4.0 updated: gnu: network-manager: Patch dlopen call to libjansson.so. |
Date: |
Mon, 10 Jan 2022 23:12:12 -0500 |
This is an automated email from the git hooks/post-receive script.
apteryx pushed a commit to branch version-1.4.0
in repository guix.
The following commit(s) were added to refs/heads/version-1.4.0 by this push:
new b8a771d5a5 gnu: network-manager: Patch dlopen call to libjansson.so.
b8a771d5a5 is described below
commit b8a771d5a50f6f33abd88b1dc8114f95f535131a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jan 10 23:08:06 2022 -0500
gnu: network-manager: Patch dlopen call to libjansson.so.
* gnu/packages/gnome.scm (network-manager)[phases]
{patch-dlopen-call-to-libjansson}: New phase.
{pre-configure}: Reinstate an assertion in test-setting.c.
---
gnu/packages/gnome.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f08cff21c8..6c63b8bc59 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7841,6 +7841,13 @@ users.")
(string-append "-Ddhclient=" dhclient)))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-dlopen-call-to-libjansson.so
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/libnm-glib-aux/nm-json-aux.c"
+ (("(handle = dlopen\\()soname" _ head)
+ (string-append
+ head "\"" (search-input-file inputs
+ "lib/libjansson.so") "\"")))))
(add-before 'configure 'pre-configure
(lambda _
;; These tests try to test aspects of network-manager's
@@ -7859,12 +7866,7 @@ users.")
((".*test-link-linux.*") "")
((".*test-lldp.*") "")
((".*test-route-linux.*") "")
- ((".*test-tc-linux.*") ""))
- ;; FIXME: The jansson check fails (see:
- ;;
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/837
- (substitute* "src/libnm-core-impl/tests/test-setting.c"
- (("g_assert\\(nm_json_vt\\(\\)\\);")
- "return TRUE;"))))
+ ((".*test-tc-linux.*") ""))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch version-1.4.0 updated: gnu: network-manager: Patch dlopen call to libjansson.so.,
guix-commits <=