From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2PPMNGkYCl+ESgAA0tVLHw (envelope-from ) for ; Sat, 11 Jul 2020 19:52:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +MelMGkYCl8USQAAB5/wlQ (envelope-from ) for ; Sat, 11 Jul 2020 19:52:09 +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 53BD194066A for ; Sat, 11 Jul 2020 19:52:09 +0000 (UTC) Received: from localhost ([::1]:59078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juLXc-00031n-AU for larch@yhetil.org; Sat, 11 Jul 2020 15:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juLXW-00031T-9U for guix-patches@gnu.org; Sat, 11 Jul 2020 15:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juLXV-00089S-WA for guix-patches@gnu.org; Sat, 11 Jul 2020 15:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1juLXV-0000vY-VX for guix-patches@gnu.org; Sat, 11 Jul 2020 15:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [[PATCH V2] 01/10] gnu: libring: Fetch from git, update to 20200708-guix. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Jul 2020 19:52:01 +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.15944970943526 (code B ref 42229); Sat, 11 Jul 2020 19:52:01 +0000 Received: (at 42229) by debbugs.gnu.org; 11 Jul 2020 19:51:34 +0000 Received: from localhost ([127.0.0.1]:44930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juLX3-0000uo-Pb for submit@debbugs.gnu.org; Sat, 11 Jul 2020 15:51:34 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juLX1-0000ud-Kg for 42229@debbugs.gnu.org; Sat, 11 Jul 2020 15:51:32 -0400 Received: from localhost (unknown [46.237.172.69]) by mira.cbaines.net (Postfix) with ESMTPSA id 7DB0627BBE1; Sat, 11 Jul 2020 20:51:30 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 99198539; Sat, 11 Jul 2020 19:51:27 +0000 (UTC) References: <20200706153442.1843-1-tona_kosmicznego_smiecia@interia.pl> <20200710183220.19829-1-tona_kosmicznego_smiecia@interia.pl> User-agent: mu4e 1.4.10; emacs 26.3 From: Christopher Baines In-reply-to: <20200710183220.19829-1-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 11 Jul 2020 20:51:25 +0100 Message-ID: <87tuydkeyq.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: Ck1NAtt/8dYr --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hey, thanks for the updated patches. Jan Wielkiewicz writes: > * gnu/packages/jami.scm > (define-module): Use the "backup" module. While I never really know what to put for the changelog, I don't normally put anything in about use-module things. > (%jami-version, %libring-commit, %libring-revision): New variables. > (jami-source): Rename procedure to (libring-source). > (libring-source)[without-daemon]: Rename keyword to [without-contrib]. > [origin]: Fetch from git, update path to the contrib directory, > update hash and commit. > (libring)[source]: Use (libring-source). > [version]: Use the (%jami-version, %libring-commit, %libring-revision) va= riables. > [inputs]: Add libarchive, remove obsolete comment - there's pjproject-jam= i already. > [arguments]: Do not chdir to "daemon" - due to fetching from git, > we're in the proper directory already. > --- > gnu/packages/jami.scm | 36 +++++++++++++++++++----------------- > 1 file changed, 19 insertions(+), 17 deletions(-) > > diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm > index d5cb3b62f6..06aeafea5d 100644 > --- a/gnu/packages/jami.scm > +++ b/gnu/packages/jami.scm > @@ -23,6 +23,7 @@ > #:use-module (gnu packages aidc) > #:use-module (gnu packages audio) > #:use-module (gnu packages autotools) > + #:use-module (gnu packages backup) > #:use-module (gnu packages base) > #:use-module (gnu packages boost) > #:use-module (gnu packages check) > @@ -62,23 +63,29 @@ > #:use-module (guix utils) > #:use-module (srfi srfi-1)) >=20=20 > -(define %jami-version "20200401.1.6f090de") > +(define %jami-version "20200708-guix") > +(define %libring-commit "07188b4a717e5ac6e582d71c895b74fbbfd02b24") > +(define %libring-revision "0") >=20=20 > -(define* (jami-source #:key without-daemon) > +(define* (libring-source #:key without-contrib) I believe this renaming will break some things, as not all the uses of jami-source are changed in this commit. I'm not really sure how strong the drive is to have all commits work, but just in terms of reviewing the patches, but at least for reviewing patches, I do find it useful if that's attempted, as it means that the patches are more self-contained, and you don't have to keep trying to look at multiple patches. Just combining together the commits where the changes are tightly related is fine, another approach would be to try and separate the changes out in to separate commits by the type of change, like one commit to change from using a tarball to the Git repository, and another to update the versions of relevant packages. > (origin > - (method url-fetch) > - (uri (string-append "https://dl.jami.net/release/tarballs/jami_" > - %jami-version > - ".tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url "https://review.jami.net/ring-daemon") > + (commit %libring-commit))) > + (file-name (git-file-name (if without-contrib > + "libring-source-without-contrib" > + "libring-source") > + %jami-version)) > (modules '((guix build utils))) > (snippet > - (if without-daemon > + (if without-contrib > '(begin > - (delete-file-recursively "daemon/contrib")) > + (delete-file-recursively "contrib")) > #f)) > (sha256 > (base32 > - "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) > + "05068ijvbd6gd9i14iz23dn5nc0fsphwa3hpdpqairqv00rr9h9b")))) >=20=20 > ;; Savoir-Faire Linux modifies many libraries to add features > ;; to Jami. This procedure makes applying patches to a given > @@ -441,8 +448,8 @@ > (define-public libring > (package > (name "libring") > - (version %jami-version) > - (source (jami-source #:without-daemon #t)) > + (version (git-version %jami-version %libring-revision %libring-commi= t)) > + (source (libring-source #:without-contrib #t)) > (build-system gnu-build-system) > (inputs > `(("alsa-lib" ,alsa-lib) > @@ -462,6 +469,7 @@ > ("opus" ,opus) > ("pcre" ,pcre) > ("pulseaudio" ,pulseaudio) > + ("libarchive" ,libarchive) > ("libsamplerate" ,libsamplerate) > ("libsndfile" ,libsndfile) > ("speex" ,speex) > @@ -479,8 +487,6 @@ > ("restinio" ,restinio) > ("libx11" ,libx11) > ("asio" ,asio) > - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjs= ip) version. > - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/2= 4. > ("pjproject" ,pjproject-jami))) > (native-inputs > `(("autoconf" ,autoconf) > @@ -494,10 +500,6 @@ > `(#:tests? #f ; The tests fail to compile due to missing he= aders. > #:phases > (modify-phases %standard-phases > - (add-after 'unpack 'change-directory > - (lambda _ > - (chdir "daemon") > - #t)) > (add-before 'build 'add-lib-dir > (lambda _ > (mkdir-p "src/lib") --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl8KGD1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xex5g//ZTjwGJ5Ok3iQgcnTgglRwiNJ6CfiIzK1dlewAO0leDLtscabryj3OpA5 k8SEcz/hsPoMIZNxZq/+wwetmnBqHR773i74vsHMJBxeSCkI/Udwf6qiyhK6RAWs 0gVPM9lVLX2oHZDJiy4Xelh/9DaINLnE8XN55aUDpvZfWaA4trNQ1rIkFP9qzfAf Ufa+A0C3RXN48q3pXv5Z9TMSqHLy3jtYgm7g2veBLUuDg9wD7UFELmSrjeUsRrIv qBQ8W4SbQRUlJk0hKrjE4HugbVWT06N9bCa6sOc1M8FihsAjb5B0nnYxewxiWL2y WECvm3izxAdgFG3yqxlCKAQNoAKti8vuORd6TmZ3ERLd0Yd/6rxxkYNf7npFPxM7 IZpgC9xCyiD9vfl1uNWV1xKftO3FEfX3dz1Eq8mTME8zNEMJiUJ8xkQZhHL2Q7m2 OHQ3S3Caa7GnyMjvbTYs5OkCOKiA1iBl7f8Vx+3Mbdv75y/f9Vo1EXaTFBtV1zX6 oCHMfUCWKqFT8RAR3pqXJNe7aj/HW5OUceqDsdU9CYEGs9QO4Ez3QK0iO8ctTASf FQFEaHTRV+5wWq1ee/lGjJ2oJ1xhPvKUs8CY8jgJuay0upz+gKKZWAzSUgRAkn8g xjO12IZ2ropY4v/p/Y+kQhVDIp3T1K9t3dv/pabKZ40385UCTbk= =fChg -----END PGP SIGNATURE----- --=-=-=--