[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/12: gnu: jami: Create a jami-apply-dependency-patches procedure.
From: |
guix-commits |
Subject: |
07/12: gnu: jami: Create a jami-apply-dependency-patches procedure. |
Date: |
Sat, 2 May 2020 06:06:07 -0400 (EDT) |
mothacehe pushed a commit to branch master
in repository guix.
commit f60699af611b001c7a28f84a9dc9281cdb727a69
Author: Jan Wielkiewicz <address@hidden>
AuthorDate: Sat May 2 03:14:38 2020 +0200
gnu: jami: Create a jami-apply-dependency-patches procedure.
* gnu/packages/jami.scm (pjproject-jami)
[native-inputs]: Rename "savoir-faire-linux-patches" to "sfl-patches".
[arguments]: Move Jami patching procedure to ...
(jami-apply-dependency-patches): ... this new procedure.
Signed-off-by: Mathieu Othacehe <address@hidden>
---
gnu/packages/jami.scm | 80 +++++++++++++++++++++++++++++----------------------
1 file changed, 45 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 8d6bab8..3b31fae 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -78,12 +78,31 @@
(base32
"0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0"))))
+;; Savoir-Faire Linux modifies many libraries to add features
+;; to Jami. This procedure makes applying patches to a given
+;; package easy.
+(define jami-apply-dependency-patches
+ '(lambda* (#:key inputs dep-name patches)
+ (let ((patches-directory "sfl-patches"))
+ (mkdir-p patches-directory)
+ (invoke "tar" "-xvf" (assoc-ref inputs "sfl-patches")
+ "-C" patches-directory
+ "--strip-components=5"
+ (string-append "ring-project/daemon/contrib/src/"
+ dep-name))
+ (for-each
+ (lambda (file)
+ (invoke "patch" "--force" "-p1" "-i"
+ (string-append patches-directory "/"
+ file ".patch")))
+ patches))))
+
(define-public pjproject-jami
(package
(inherit pjproject)
(name "pjproject-jami")
(native-inputs
- `(("savoir-faire-linux-patches" ,(jami-source))
+ `(("sfl-patches" ,(jami-source))
,@(package-native-inputs pjproject)))
(arguments
`(#:tests? #f
@@ -125,40 +144,31 @@
#t))
(add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
- (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux
patches")
- ;; Comes from
- ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
- ;; WARNING: These amount for huge changes in pjproject.
- (savoir-faire-linux-patches
- '("fix_turn_alloc_failure"
- "rfc2466"
- "ipv6"
- "multiple_listeners"
- "pj_ice_sess"
- "fix_turn_fallback"
- "fix_ioqueue_ipv6_sendto"
- "add_dtls_transport"
- "rfc6544"
- "ice_config"
- "sip_config"
- "fix_first_packet_turn_tcp"
- "fix_ebusy_turn"
- "ignore_ipv6_on_transport_check"
- "fix_turn_connection_failure"
- ;; "uwp_vs" ; for windows
- "disable_local_resolution")))
- (mkdir-p savoir-faire-linux-patches-directory)
- (invoke "tar" "-xvf" (assoc-ref inputs
"savoir-faire-linux-patches")
- "-C" savoir-faire-linux-patches-directory
- "--strip-components=5"
- "ring-project/daemon/contrib/src/pjproject")
- (for-each
- (lambda (file)
- (invoke "patch" "--force" "-p1" "-i"
- (string-append savoir-faire-linux-patches-directory
"/"
- file ".patch")))
- savoir-faire-linux-patches))
- #t))
+ (let ((jami-apply-dependency-patches
,jami-apply-dependency-patches))
+ ;; Comes from
+ ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+ ;; WARNING: These amount for huge changes in pjproject.
+ (jami-apply-dependency-patches
+ #:inputs inputs
+ #:dep-name "pjproject"
+ #:patches
+ '("fix_turn_alloc_failure"
+ "rfc2466"
+ "ipv6"
+ "multiple_listeners"
+ "pj_ice_sess"
+ "fix_turn_fallback"
+ "fix_ioqueue_ipv6_sendto"
+ "add_dtls_transport"
+ "rfc6544"
+ "ice_config"
+ "sip_config"
+ "fix_first_packet_turn_tcp"
+ "fix_ebusy_turn"
+ "ignore_ipv6_on_transport_check"
+ "fix_turn_connection_failure"
+ "disable_local_resolution"))
+ #t)))
;; TODO: We could use substitute-keyword-arguments instead of
;; repeating the phases from pjproject, but somehow it does
;; not work.
- branch master updated (807986a -> 8c98eb2), guix-commits, 2020/05/02
- 01/12: gnu: Add libnatpmp., guix-commits, 2020/05/02
- 04/12: gnu: opendht: Update to 2.0.0., guix-commits, 2020/05/02
- 02/12: gnu: libupnp: Update to 1.8.6., guix-commits, 2020/05/02
- 03/12: gnu: restinio: Update to 0.6.1.1., guix-commits, 2020/05/02
- 07/12: gnu: jami: Create a jami-apply-dependency-patches procedure.,
guix-commits <=
- 06/12: gnu: jami: Fix download., guix-commits, 2020/05/02
- 09/12: gnu: jami: Make gettext a native input., guix-commits, 2020/05/02
- 11/12: gnu: jami: Use gettext-minimal., guix-commits, 2020/05/02
- 08/12: gnu: libring: Add libnatpmp dependency., guix-commits, 2020/05/02
- 05/12: gnu: telephony: Move Jami and its dependencies to jami.scm., guix-commits, 2020/05/02
- 12/12: gnu: jami: Add epoll support., guix-commits, 2020/05/02
- 10/12: gnu: pjproject-jami: Update to 2.10., guix-commits, 2020/05/02