From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kIHiH6oYCl/2PgAA0tVLHw (envelope-from ) for ; Sat, 11 Jul 2020 19:53:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iC6SG6oYCl97CgAAbx9fmQ (envelope-from ) for ; Sat, 11 Jul 2020 19:53:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0394B9409E6 for ; Sat, 11 Jul 2020 19:53:14 +0000 (UTC) Received: from localhost ([::1]:59674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juLYe-0003Mh-Uk for larch@yhetil.org; Sat, 11 Jul 2020 15:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juLYV-0003MR-G6 for guix-patches@gnu.org; Sat, 11 Jul 2020 15:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juLYU-0008E5-B6 for guix-patches@gnu.org; Sat, 11 Jul 2020 15:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1juLYU-0000xH-Ab for guix-patches@gnu.org; Sat, 11 Jul 2020 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [[PATCH V2] 03/10] gnu: jami-apply-dependency-patches, ffmpeg-jami, pjproject-jami: Apply patches from the new libring source. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Jul 2020 19:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jan Wielkiewicz Cc: 42229@debbugs.gnu.org Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15944971813664 (code B ref 42229); Sat, 11 Jul 2020 19:53:02 +0000 Received: (at 42229) by debbugs.gnu.org; 11 Jul 2020 19:53:01 +0000 Received: from localhost ([127.0.0.1]:44934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juLYT-0000x2-82 for submit@debbugs.gnu.org; Sat, 11 Jul 2020 15:53:01 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juLYR-0000wu-DD for 42229@debbugs.gnu.org; Sat, 11 Jul 2020 15:52:59 -0400 Received: from localhost (unknown [46.237.172.69]) by mira.cbaines.net (Postfix) with ESMTPSA id DF68927BBE1; Sat, 11 Jul 2020 20:52:58 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ca2b84b2; Sat, 11 Jul 2020 19:52:56 +0000 (UTC) References: <20200710183220.19829-1-tona_kosmicznego_smiecia@interia.pl> <20200710183220.19829-3-tona_kosmicznego_smiecia@interia.pl> User-agent: mu4e 1.4.10; emacs 26.3 From: Christopher Baines In-reply-to: <20200710183220.19829-3-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 11 Jul 2020 20:52:56 +0100 Message-ID: <87r1thkew7.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.69 X-TUID: ov51iqmj/IS3 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jan Wielkiewicz writes: > * gnu/packages/jami.scm: > (libring-source): [without-contrib] is now true by default. > (jami-apply-dependency-patches): Do not invoke tar, > patches are now fetched from git. > Apply "--ignore-whitespace" to patch to prevent failing. > (pjproject-jami)[native-inputs]: Use (libring-source) procedure instead of > (jami-source). > [arguments]: Add new patches. > (ffmpeg-jami)[native-inputs]: Use (libring-source) procedure instead of > (jami-source). > --- > gnu/packages/jami.scm | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm > index abb0edc933..1da50d7744 100644 > --- a/gnu/packages/jami.scm > +++ b/gnu/packages/jami.scm > @@ -67,7 +67,7 @@ > (define %libring-commit "07188b4a717e5ac6e582d71c895b74fbbfd02b24") > (define %libring-revision "0") >=20=20 > -(define* (libring-source #:key without-contrib) > +(define* (libring-source #:key (without-contrib #t)) > (origin > (method git-fetch) > (uri (git-reference > @@ -92,16 +92,13 @@ > ;; 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=3D5" > - (string-append "ring-project/daemon/contrib/src/" > - dep-name)) > + (let ((patches-directory (string-append > + (assoc-ref inputs "sfl-patches") > + "/contrib/src/" dep-name))) > (for-each > (lambda (file) > - (invoke "patch" "--force" "-p1" "-i" > + (invoke "patch" "--force" > + "--ignore-whitespace" "-p1" "-i" > (string-append patches-directory "/" > file ".patch"))) > patches)))) > @@ -111,7 +108,7 @@ > (inherit pjproject) > (name "pjproject-jami") > (native-inputs > - `(("sfl-patches" ,(jami-source)) > + `(("sfl-patches" ,(libring-source #:without-contrib #f)) > ,@(package-native-inputs pjproject))) > (arguments > `(#:tests? #f > @@ -174,7 +171,9 @@ > "0006-ignore_ipv6_on_transport_check" > "0007-pj_ice_sess" > "0008-fix_ioqueue_ipv6_sendto" > - "0009-add-config-site")) > + "0009-add-config-site" > + "0010-fix-pkgconfig" > + "0011-fix-tcp-death-detection")) > #t))) > ;; TODO: We could use substitute-keyword-arguments instead of > ;; repeating the phases from pjproject, but somehow it does > @@ -414,7 +413,7 @@ > (inherit ffmpeg) > (name "ffmpeg-jami") > (native-inputs > - `(("sfl-patches" ,(jami-source)) > + `(("sfl-patches" ,(libring-source #:without-contrib #f)) > ("libiconv" ,libiconv) > ,@(package-native-inputs ffmpeg))) > (supported-systems '("x86_64-linux" "i686-linux" Relating to my comment on the first patch on this series, these changes here look like part of that change. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl8KGJhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdZ7A/+MXo/Xja90meJ5fNAq3DdA0Sg6HlcbKZV5BJM2ZM5qXizKA2NxEKz5A21 n+i9leR5kmasRBo8V1ciFKLcYXfmcBgW0NNwYOwhnxPh4kB5Rb53RslIz84JvVJf AVgWsEAzPOQaMWeJ/V51u9eSB5bd5mvjK5bflcXt5Lp0SjTyLWJ+2NFQLmKsHmbF 1N6r9Azgjcu3LDQxOqvkM20C5jrRo0dAJr3eBfdyeFUqviTpC4d/NtY7i5D/KRbI f5fPVpnlVbaNOIrOFR/HAq2f8ipAm6jAGPy4S5Y2/HVHXS4YyZWk2ohyam99TnjU JGVteOnINxoClGoPrJhtd32AQgxiiX3XC9uxw1wTFWePczZXpoM+FWqrNn2MrehW XyhFet0F7ePUCRtSc7gmg+wR5tqNYEaEH9SVrSxk7uwlZh7rnzhS1IsLPmFYBF3X qTL50p8eyVX9slYdeO+LvjjEKFAtypgvtGJydRqTHqFfmtuPHdrr8TLhoyFA3LO5 CqUkO4o4YqVAuyR6TOPbeUk7UYzGRE9FxkNGiq7y6uL3CAOp+9aVVDFsJ0LEmWV5 o0wh8AJ6dX6kaRZzNtUvZUwnRVeDsSanRRN97hNUdX8j8B+3VEmWa4ZT3q+6lyIr rD3qRLce/XtiE221OcGNciIDIImUzdORQ/eD0pmsGESXyhDSrFA= =lfmE -----END PGP SIGNATURE----- --=-=-=--