[bug#42229] [[PATCH V2] 03/10] gnu: jami-apply-dependency-patches, ffmpeg-jami, pjproject-jami: Apply patches from the new libring source.

[Christopher Baines]

Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> 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")
>  
> -(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=5"
> -               (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.

signature.asc
Description: PGP signature