From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EHvBHFi8WmA5cgAA0tVLHw (envelope-from ) for ; Wed, 24 Mar 2021 04:13:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eJu1GFi8WmBPYQAA1q6Kng (envelope-from ) for ; Wed, 24 Mar 2021 04:13:12 +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 D84F421496 for ; Wed, 24 Mar 2021 05:13:11 +0100 (CET) Received: from localhost ([::1]:41234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOutL-0002n0-1I for larch@yhetil.org; Wed, 24 Mar 2021 00:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOutC-0002lD-1y for guix-patches@gnu.org; Wed, 24 Mar 2021 00:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOutB-0003Hy-RE for guix-patches@gnu.org; Wed, 24 Mar 2021 00:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOutB-0005vy-Ml for guix-patches@gnu.org; Wed, 24 Mar 2021 00:13:01 -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: Wed, 24 Mar 2021 04:13:01 +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.161655914922754 (code B ref 47274); Wed, 24 Mar 2021 04:13:01 +0000 Received: (at 47274) by debbugs.gnu.org; 24 Mar 2021 04:12:29 +0000 Received: from localhost ([127.0.0.1]:33713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOuse-0005uu-Kz for submit@debbugs.gnu.org; Wed, 24 Mar 2021 00:12:29 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:37702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOusc-0005ug-2P for 47274@debbugs.gnu.org; Wed, 24 Mar 2021 00:12:26 -0400 Received: by mail-qt1-f176.google.com with SMTP id f12so16698324qtq.4 for <47274@debbugs.gnu.org>; Tue, 23 Mar 2021 21:12:26 -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=aRFAvTTVOem2J76QRKZtg+Mjboa6IaI0+d2K1Wrq1C4=; b=VGflbqMk7T8zkwINJ1lqPhyKbBCo+o3EOmnedKyz8tWPc7FUwMyaqX/Ykgp5ho3Xcb GrmYskc/8GL7yTTfW6PGcUbqQSNHLgmRZ6fFcnXRZHS4yPeCleZdRwWZTi6obJpWX+T1 gaI9WhlnAVdao6IeWPpNonnsWqlyfUKlGYrNq5HVWR2sC4tz3rkLJ712TdW7FnPVrJlZ Tmd0SBbpMGElZOj4pg8RhRuICASSgVu8HbBdNPVpQiBkViC6crI8vMCGppqwxXS6o2CJ alW5Xa6s2eMH1jRDKIIQSxOPq7T5RZ5p1UDv4xKXLXDx+8U/hDLXW8FthUBlqJm+9XAk hsTA== 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=aRFAvTTVOem2J76QRKZtg+Mjboa6IaI0+d2K1Wrq1C4=; b=UNwUpLBhdv9ieZyH6ZAy0HxeogeNMwlVzO5q36AeCg7KGOLN7BKhh1GxIB8mQ37E2j r41i4Sup8Jl0psJu7VWqP/nUUnJeB4UebqTthFtyK/fOzAYGLKMPvbf38pHpWb94Q7+f MBTj2NLqxn2rf63AA6zJ32l+KWTqKz2eVTHGSXUne5D63N+i8piYzVkKXNMFNw7XKEFm M4LNhZABZTVWMxayNuM7EX+y6CyLczXpV8cdtrUnxDIX3ydTL26zouNfQO5ITI4GXpTC DbhZiMZLW7QdVrSmtaF9fIEg5afZQUR+5l+A75YdMJgG8FmLkFOVljwWxJtDJpslTpSQ IjSQ== X-Gm-Message-State: AOAM533oa6RhLoFKgTG3KMCRFzmlweyG+7og4Gsurct/Hycm8qy79zyG rXACSTchk0+GEbmHnvE6I2g= X-Google-Smtp-Source: ABdhPJxRQHLjHreLGYhOIfXWcfZ2eUIzIbvQGnGOV05v794RLK5xlM6EmYIeSqNGu4HQh60cavEcCA== X-Received: by 2002:ac8:7747:: with SMTP id g7mr1400047qtu.144.1616559140733; Tue, 23 Mar 2021 21:12:20 -0700 (PDT) Received: from hurd (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id k138sm825202qke.60.2021.03.23.21.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 21:12:20 -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: Wed, 24 Mar 2021 00:12:19 -0400 In-Reply-To: (Raghav Gururajan's message of "Mon, 22 Mar 2021 00:44:06 -0400") Message-ID: <87tup1tckc.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=1616559192; 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=aRFAvTTVOem2J76QRKZtg+Mjboa6IaI0+d2K1Wrq1C4=; b=chO6kUOXik6Yrl3chej5OpuIRqMqMD9LmW0dZ4sTLF3lecj57KQI0X1u2V81ZjCde8zr2q GsJ2ixOBj4jsNCf18YJdQ8DcI7Yt2pDeqnUfH849lTQDug19ijodMmKgpTXHiXjkyws1QH J9Xlim8MTmNe4XL0KELy90sFxVkeR7nOtKOwU7VApW4Tscn8Y8GxuTfqZdNpxS+iy777vt AVgtxpQzDaa/4tlTz/OtU1nIPJB30OfvYeuJ5KS7hEUWtSdzFQcLapqAwAy8eCiMxTJ7Uc +NJ3655i87ODf/djhtYTurkOZ112A6vAWbnvTc3nUkEKQuqGzWV/4I5PcFLH7g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616559192; a=rsa-sha256; cv=none; b=P5HJRuu3CWSZtwMp/POH7fyrUVT0uwj5fn7ThofQRq0C8N6hW9DzXDKkTaS8zMiyBM1fT/ cM/kk/cHuC8fxBnqs8AEHLOc4mFfufhBOrXOdy1QoSv+S53RBWVatLZRk7BaEzuFrW1Kx3 D9W2tUDefVzktTUxFwJnBE+8Fx4n8mWvEbB6gJdDgTWPQ+0CAl9a7q578OCi7IM9uKryGD AZQfc9Hn/ZaX1g/bS01SZDtF8drD+TRi0KIVM1S+70RyAIkMywC+dfuA2Lia1M96hjq3Sc nEfYA3fE8RCm05WUg/Sgwbx/h5zRRHYEsxb++4i/L2YPXHa/+IlT6u9utoIr4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=VGflbqMk; 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-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=VGflbqMk; 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: D84F421496 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: DrabZXosz4Tm Hi again, Raghav Gururajan writes: > From 4b03df1e5abf22da27c65e1f22ffe4be65377d29 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Sat, 13 Mar 2021 12:04:37 -0500 > Subject: [PATCH 02/53] gnu: bcunit: Update to 3.0.2-13. > > * gnu/packages/linphone.scm (bcunit) [source]: Switch to git repository. Nitpick: there should be no space between (bcunit) and [source]. > [version]: Update to 3.0.2-13. > [native-inputs]: Add perl. > --- > gnu/packages/linphone.scm | 30 ++++++++++++++++++------------ > 1 file changed, 18 insertions(+), 12 deletions(-) > > diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm > index afa542412f..6d243d2073 100644 > --- a/gnu/packages/linphone.scm > +++ b/gnu/packages/linphone.scm > @@ -35,6 +35,7 @@ > #:use-module (gnu packages gtk) > #:use-module (gnu packages image) > #:use-module (gnu packages linux) > + #:use-module (gnu packages perl) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages python) > #:use-module (gnu packages python-xyz) > @@ -57,28 +58,33 @@ > #:use-module (guix build-system gnu)) > > (define-public bcunit > - (package > - (name "bcunit") > - (version "3.0.2") > - (source > - (origin > - (method url-fetch) > - (uri > - (string-append "https://www.linphone.org/releases/sources/" name > - "/" name "-" version ".tar.gz")) > - (sha256 > - (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk")))) > + (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") > + (revision "13")) When not using an official release, a comment is in order to mention the reason; in this case something like: "Use the latest commit as there hasn't been a release in nearly 4 years." :-). Also, why start the revision number at 13? Perhaps the number of commits since the last tagged release? It's a detail, but since there was no revision used before for this package, I'd expect it to start at 0. > + (package > + (name "bcunit") > + (version (git-version "3.0.2" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "git://git.linphone.org/bcunit") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b")))) > (build-system cmake-build-system) > (arguments > '(#:tests? #f ; No test target > #:configure-flags > (list "-DENABLE_STATIC=NO"))) ; Not required > + (native-inputs > + `(("perl" ,perl))) Seems Perl is not actually needed. > (synopsis "Belledonne Communications Unit Testing Framework") > (description "BCUnit is a fork of the defunct project CUnit, with several > fixes and patches applied. It is an unit testing framework for writing, ^ a > administering, and running unit tests in C.") > (home-page "https://gitlab.linphone.org/BC/public/bcunit") > - (license license:lgpl2.0+))) > + (license license:lgpl2.0+)))) > > (define-public bctoolbox > (package I ended up squashing all the bcunit changes in one, as I found it a bit too micro to manage. I've edited the result slightly, mostly taking out #t, the examples output (examples are doc after all): --8<---------------cut here---------------start------------->8--- 1 file changed, 18 insertions(+), 26 deletions(-) gnu/packages/linphone.scm | 44 ++++++++++++++++++-------------------------- modified gnu/packages/linphone.scm @@ -60,7 +60,7 @@ (define-public bcunit (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") - (revision "13")) + (revision "0")) (package (name "bcunit") (version (git-version "3.0.2" revision commit)) @@ -74,16 +74,14 @@ (sha256 (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b")))) (build-system cmake-build-system) - (outputs '("out" "doc" "example")) + (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list - "-DENABLE_STATIC=NO" - "-DENABLE_CURSES=ON" - "-DENABLE_DOC=ON" - "-DENABLE_EXAMPLES=ON" - "-DENABLE_TEST=ON" - "-DENABLE_MEMTRACE=ON") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_CURSES=ON" + "-DENABLE_DOC=ON" + "-DENABLE_EXAMPLES=ON" + "-DENABLE_TEST=ON" + "-DENABLE_MEMTRACE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -99,36 +97,30 @@ (("target_include_directories\\(bcunit_test PUBLIC Test\\)") (string-append "target_include_directories(bcunit_test PUBLIC Test)\n" - "target_link_libraries(bcunit_test bcunit)"))) - #t)) + "target_link_libraries(bcunit_test bcunit)"))))) (replace 'check (lambda _ (with-directory-excursion "BCUnit/Sources/Test" - (invoke "./test_bcunit")) - #t)) - (add-after 'install 'seperate-outputs + (invoke "./test_bcunit")))) + (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (example (assoc-ref outputs "example"))) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) (for-each mkdir-p `(,(string-append doc "/share/doc") - ,(string-append example "/share/BCUnit"))) + ,(string-append doc "/share/BCUnit"))) (rename-file (string-append out "/share/doc/BCUnit") (string-append doc "/share/doc/BCUnit")) (rename-file (string-append out "/share/BCUnit/Examples") - (string-append example "/share/BCUnit/Examples"))) - #t))))) - (native-inputs - `(("perl" ,perl))) + (string-append doc "/share/BCUnit/Examples")))))))) (inputs `(("ncurses" ,ncurses))) (synopsis "Belledonne Communications Unit Testing Framework") - (description "BCUnit is a fork of the defunct project CUnit, with several -fixes and patches applied. It is an unit testing framework for writing, -administering, and running unit tests in C.") + (description "BCUnit is a fork of the defunct project CUnit, with +several fixes and patches applied. It is a unit testing framework for +writing, administering, and running unit tests in C.") (home-page "https://gitlab.linphone.org/BC/public/bcunit") (license license:lgpl2.0+)))) --8<---------------cut here---------------end--------------->8--- I've also "normalized" the commit message in a way that I think is more typical. Arguments such as phases, configure-flags, and such are typically enclosed in a conditional marker (square brakets); e.g.: --8<---------------cut here---------------start------------->8--- gnu: bcunit: Update to 3.0.2-0.74021cc and enable more features. * gnu/packages/linphone.scm (bcunit)[source]: Switch to git repository. [version]: Update to 3.0.2-0.74021cc. [outputs]: Add a "doc" output. [arguments]: Remove the tests? argument, enabling tests. [configure-flags]: Enable curses, doc, examples, tests and memtrace. [phases]{patch-source, move-doc}: New phases. {check}: Override phase. [inputs]: Add ncurses. [description]: Fix typo. --8<---------------cut here---------------end--------------->8--- That's all very subjective, but hoping you get a feel :-). After having verified that bcunit's dependent packages could still be built fine and testing the resulting linphoneqt, I've pushed the squashed bcunit series as commit c2a9b05f02. Thank you! Maxim