From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:56867) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPEyI-000877-JC for guix-patches@gnu.org; Thu, 16 Apr 2020 20:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPEyH-0004CI-FC for guix-patches@gnu.org; Thu, 16 Apr 2020 20:35:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPEyH-0004CC-Bo for guix-patches@gnu.org; Thu, 16 Apr 2020 20:35:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPEyH-0005iz-8b for guix-patches@gnu.org; Thu, 16 Apr 2020 20:35:05 -0400 Subject: [bug#40677] [PATCH 05/30] gnu: pjproject-jami: Use the jami-apply-dependency-patches procedure. Resent-Message-ID: From: Jan Wielkiewicz Date: Fri, 17 Apr 2020 02:34:08 +0200 Message-Id: <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-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 | 60 +++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 27f6ff26f5..b165335e26 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -131,6 +131,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 @@ -139,40 +141,30 @@ #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