From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:52306) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVK-0003Nq-D8 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00046f-NF for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00046P-8B for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVJ-000624-1N for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Subject: [bug#40677] [PATCH 03/18] gnu: jami.scm: Add and use a generalized procedure for applying patches made by Savoir-faire linux to Jami dependencies. Resent-Message-ID: From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:17 +0200 Message-Id: <20200421161032.1847-3-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz --- gnu/packages/jami.scm | 82 +++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 44a57c9bfb..3a50cef18a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -77,12 +77,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-public 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 @@ -116,6 +135,8 @@ ;; making a shared object; "CFLAGS=-fPIC" "CXXFLAGS=-fPIC") + #:modules ((guix build utils) + ,@(@@ (guix build-system gnu) %default-modules)) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -124,40 +145,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. -- 2.26.1