Hey, thanks for the updated patches.

Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> 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) variables.
> [inputs]: Add libarchive, remove obsolete comment - there's pjproject-jami 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))
>  
> -(define %jami-version "20200401.1.6f090de")
> +(define %jami-version "20200708-guix")
> +(define %libring-commit "07188b4a717e5ac6e582d71c895b74fbbfd02b24")
> +(define %libring-revision "0")
>  
> -(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"))))
>  
>  ;; 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-commit))
> +    (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. pjsip) version.
> -       ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24.
>         ("pjproject" ,pjproject-jami)))
>      (native-inputs
>       `(("autoconf" ,autoconf)
> @@ -494,10 +500,6 @@
>       `(#:tests? #f         ; The tests fail to compile due to missing headers.
>         #: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")