From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4NlVNjqLXGBXMwEAgWs5BA (envelope-from ) for ; Thu, 25 Mar 2021 14:08:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WGABMjqLXGBkKQAAB5/wlQ (envelope-from ) for ; Thu, 25 Mar 2021 13:08:10 +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 6A3C81EA16 for ; Thu, 25 Mar 2021 14:08:10 +0100 (CET) Received: from localhost ([::1]:60160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPPib-0000Lv-K3 for larch@yhetil.org; Thu, 25 Mar 2021 09:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPPiU-0000Ll-Ui for guix-patches@gnu.org; Thu, 25 Mar 2021 09:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPPiU-0003WV-Mr for guix-patches@gnu.org; Thu, 25 Mar 2021 09:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPPiU-0006jg-I0 for guix-patches@gnu.org; Thu, 25 Mar 2021 09:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47274] Linphone Packages Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Mar 2021 13:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 47274@debbugs.gnu.org, =?UTF-8?Q?L=C3=A9o?= Le Bouter , Danny Milosavljevic Received: via spool by 47274-submit@debbugs.gnu.org id=B47274.161667764525848 (code B ref 47274); Thu, 25 Mar 2021 13:08:02 +0000 Received: (at 47274) by debbugs.gnu.org; 25 Mar 2021 13:07:25 +0000 Received: from localhost ([127.0.0.1]:37476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPPht-0006ip-8h for submit@debbugs.gnu.org; Thu, 25 Mar 2021 09:07:25 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:40640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPPhr-0006ib-44 for 47274@debbugs.gnu.org; Thu, 25 Mar 2021 09:07:23 -0400 Received: by mail-qk1-f176.google.com with SMTP id 7so1603138qka.7 for <47274@debbugs.gnu.org>; Thu, 25 Mar 2021 06:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=qAL09ZPp3L0nqOf74tIDpmZ2mHifXspog5706dRU5VA=; b=mq+xjtr9HHOjK/K48gSJn9WMCV5hNhoOZyUXL47Mh5QAGqWo+snD7WLvRdZrTVLxNl gzigAHaQcnJhximnv5s83qQye8/BWfmExqp598B0v9dtoWDrKBooAe0g8DocgXajvpVN iDWUdqmPzxQE8g6/mxMAEGNueRCy0ts/CatJ2dunaoDo/D4GWdn4oywf6vRold7IUsc9 FK3FU08UFJQr1bFbByHZ4p7gC9opvXMVvLswZNd9JDyvmQIvq7c7nE1bRA4+07tzD3CO IHo60HLCDESaYbLBa3AbgtZ7qApbYmURfJ6eecRg9sEcYZZU1F23GZRYNK2EaVB84nGx N8tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=qAL09ZPp3L0nqOf74tIDpmZ2mHifXspog5706dRU5VA=; b=gJ/szpwAKr3dBj0n0Ycpz6zakdqrQfCXK+3RpReUU8tu6FQEvT2vFIRIiX6QN4UlJg 7I7u5Mm7PLO6G9jZgbrhgJmUe2bPPtjLR+L6haYw5I8Fz9SCBQ6fEyOGR/7C49aVzkJL jc7GnizAVR4sL7plqf2mtQOLXTlO7nFP/i2Si7E6F6LfmE7b1ECOcmWjjZST/8pKvos7 bN9kvbGarL4kCve03DqgN4CAlGoL6vDRe1X54TITSbg9EpJ7cSb+BNT7RyGL8wK7ryoS 5kNREmXcCDb+CXR8WV/wb1SMmNIT2jJmQn0bK+7RinYhhOCfGEGcMYkFro9DJL/KTgK1 ubxQ== X-Gm-Message-State: AOAM533QBGVj7dU/eg4S9+YCGv4+pJSjRy1KGNLbhJxN50NsW9bEInId TKHh7y1Uc/whzOgA7kaJnXo= X-Google-Smtp-Source: ABdhPJzH4pSvemOqmgd2ZUsxVAOsEipuVAVtoThvIJFrUnXJE+NVpGG1xQqhop0VrbaM55Pn2HwM1A== X-Received: by 2002:a05:620a:13ec:: with SMTP id h12mr7742344qkl.460.1616677637576; Thu, 25 Mar 2021 06:07:17 -0700 (PDT) Received: from hurd (dsl-156-46.b2b2c.ca. [66.158.156.46]) by smtp.gmail.com with ESMTPSA id y19sm4055050qky.111.2021.03.25.06.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 06:07:16 -0700 (PDT) From: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Thu, 25 Mar 2021 09:07:15 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87ft0js7p8.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616677690; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=qAL09ZPp3L0nqOf74tIDpmZ2mHifXspog5706dRU5VA=; b=KvHlm+v/VIZlKpxO67NXAqLzZESOTA0/JQZar2AQ4uMYzEbpcPGnMyte3Z72Ck1iz+GwFz NvbmgpgYwsayYSenukCwyM4uoVGxLy7BOV9W9G7xy5+5a0P18VzZQA+dvzOAuUYDbPqKX8 2a+WkW5jGQa3rOwdduZGY3A47V4EvbSucMW1dusKA+swasbuVxb5WbacqOZnPX59ZxIqTP 9Go78PnUtA6sZqTJIasLqr8PMVhCICvX5SbfWfQoTkpvRWBQBuKMkq0lW9WDvkdMS4m7Zn ND2F7WjQCDKJ35g1DXREKY73tjiN20rTbt/OaQTP1DerXDvUPjVFoh66kma8Cw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616677690; a=rsa-sha256; cv=none; b=kwVWKq8AT4gh4XsFTiogRHDPCG0uMXJbS2/YS845ZDKuY6QZFe6t3QQFWQX3rDEtqMoci4 pwb0NBfsdwJyhI35UGmPlHD7gwU0YyIiiJXKomzyN3ht31uyUYXkRZ1lzN0G6bw77EyLe3 YDbEbZJYcMWOVvLPD3S9SiHWoUlrM/cb/v386S6x0bDFTbpUMS9j4aNiGjgzF8skiRhhR3 Md6T1Jkw/DTqXbl8aLr1n1Q4BRn9ZEgzfoOhfhMAtdyj02T5+RlJSKso+twb/W8VpA1nT2 MFEo4aV9dPlLLsLYSS5WgpvByGqNYJmWhk0DNRuuDiXy5mCfiBdV8CuLyChAOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=mq+xjtr9; 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-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=mq+xjtr9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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-Migadu-Queue-Id: 6A3C81EA16 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: eobRV8dNK0qn Hi Raghav, Raghav Gururajan writes: > * gnu/packages/linphone.scm (ortp) [outputs]: New output "test". > [arguments]<#:configure-flag>[-DENABLE_TESTS]: New flag. > <#:phases>['seperate-outputs]: Modify. > --- > gnu/packages/linphone.scm | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm > index 3273df02c2..98209ee982 100644 > --- a/gnu/packages/linphone.scm > +++ b/gnu/packages/linphone.scm > @@ -403,23 +403,30 @@ such as conferencing.") > (sha256 > (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) > (build-system cmake-build-system) > - (outputs '("out" "doc")) > + (outputs '("out" "doc" "test")) > (arguments > - `(#:tests? #f ; No test target > + `(#:tests? #f ; Require networking > #:configure-flags > (list > - "-DENABLE_STATIC=NO") > + "-DENABLE_STATIC=NO" > + "-DENABLE_TESTS=YES") > #:phases > (modify-phases %standard-phases > (add-after 'install 'seperate-outputs > (lambda* (#:key outputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > (doc (assoc-ref outputs "doc")) > - (doc-name (string-append ,name "-4.4.0"))) > - (mkdir-p (string-append doc "/share/doc")) > + (doc-name (string-append ,name "-4.4.0")) > + (test (assoc-ref outputs "test"))) > + (for-each mkdir-p > + `(,(string-append doc "/share/doc") > + ,(string-append test "/bin"))) > (rename-file > (string-append out "/share/doc/" doc-name) > - (string-append doc "/share/doc/" doc-name))) > + (string-append doc "/share/doc/" doc-name)) > + (rename-file > + (string-append out "/bin") > + (string-append test "/bin"))) > #t))))) > (native-inputs > `(("dot" ,graphviz) > -- > 2.31.0 > > From 89e071f57db2da8deed0c19e722e8eec35b509a1 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Mon, 15 Mar 2021 22:19:47 -0400 > Subject: [PATCH 20/53] gnu: ortp: Seperate outputs. > > * gnu/packages/linphone.scm (ortp) [outputs]: New output "doc". > [arguments]<#:phases>['seperate-outputs]: New phase. > --- > gnu/packages/linphone.scm | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm > index fbe9d81d58..3273df02c2 100644 > --- a/gnu/packages/linphone.scm > +++ b/gnu/packages/linphone.scm > @@ -403,10 +403,24 @@ such as conferencing.") > (sha256 > (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) > (build-system cmake-build-system) > + (outputs '("out" "doc")) > (arguments > `(#:tests? #f ; No test target > #:configure-flags > - (list "-DENABLE_STATIC=NO"))) ; Not required > + (list > + "-DENABLE_STATIC=NO") > + #:phases > + (modify-phases %standard-phases > + (add-after 'install 'seperate-outputs > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (doc (assoc-ref outputs "doc")) > + (doc-name (string-append ,name "-4.4.0"))) > + (mkdir-p (string-append doc "/share/doc")) > + (rename-file > + (string-append out "/share/doc/" doc-name) > + (string-append doc "/share/doc/" doc-name))) > + #t))))) > (native-inputs > `(("dot" ,graphviz) > ("doxygen" ,doxygen))) > -- > 2.31.0 > > From aa8b9dbcca306c55bfd8335d8a8ee933cfa60654 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Mon, 15 Mar 2021 22:09:07 -0400 > Subject: [PATCH 19/53] gnu: ortp: Update to 4.4.34. > > * gnu/packages/linphone.scm (ortp) [source]: Switch to git repository. > [version]: Update to 4.4.34. > --- > gnu/packages/linphone.scm | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm > index f1bcae1208..fbe9d81d58 100644 > --- a/gnu/packages/linphone.scm > +++ b/gnu/packages/linphone.scm > @@ -392,15 +392,16 @@ such as conferencing.") > (define-public ortp > (package > (name "ortp") > - (version "1.0.2") > + (version "4.4.34") > (source > (origin > - (method url-fetch) > - (uri > - (string-append "https://www.linphone.org/releases/sources/" name > - "/" name "-" version ".tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url "git://git.linphone.org/ortp") > + (commit version))) > + (file-name (git-file-name name version)) > (sha256 > - (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5")))) > + (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) > (build-system cmake-build-system) > (arguments > `(#:tests? #f ; No test target I suggest squashing these into one patch like this: --8<---------------cut here---------------start------------->8--- 1 file changed, 13 insertions(+), 17 deletions(-) gnu/packages/linphone.scm | 30 +++++++++++++----------------- modified gnu/packages/linphone.scm @@ -363,15 +363,15 @@ such as conferencing.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/ortp") + (url "https://gitlab.linphone.org/BC/public/ortp") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) (build-system cmake-build-system) - (outputs '("out" "doc" "test")) + (outputs '("out" "doc" "tester")) (arguments - `(#:tests? #f ; Require networking + `(#:tests? #f ;requires networking #:configure-flags (list "-DENABLE_STATIC=NO" @@ -380,20 +380,16 @@ such as conferencing.") (modify-phases %standard-phases (add-after 'install 'seperate-outputs (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (doc-name (string-append ,name "-4.4.0")) - (test (assoc-ref outputs "test"))) - (for-each mkdir-p - `(,(string-append doc "/share/doc") - ,(string-append test "/bin"))) - (rename-file - (string-append out "/share/doc/" doc-name) - (string-append doc "/share/doc/" doc-name)) - (rename-file - (string-append out "/bin") - (string-append test "/bin"))) - #t))))) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-4.4.0")) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p (list (string-append doc "/share/doc") + (string-append test "/bin"))) + (rename-file (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name)) + (rename-file (string-append out "/bin") + (string-append tester "/bin")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) --8<---------------cut here---------------end--------------->8--- Was there a reason to version the doc using the hard-coded 4.4.0 version string rather than the package version? Thanks, Maxim