Subject: Re: [bug#40677] [PATCH 05/30] gnu: pjproject-jami: Use the jami-apply-dependency-patches procedure.

From: Mathieu Othacehe <[email-masked]>
Date: Sat, 18 Apr 2020 14:27:04 +0200

> -             (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")
> -                   ;; Comes from
> -                   ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
> -                   ;; WARNING: These amount for huge changes in pjproject.
> -                   (savoir-faire-linux-patches
> -                    '("fix_turn_alloc_failure"
> -                      "rfc2466"
> -                      "ipv6"
> -                      "multiple_listeners"
> -                      "pj_ice_sess"
> -                      "fix_turn_fallback"
> -                      "fix_ioqueue_ipv6_sendto"
> -                      "add_dtls_transport"
> -                      "rfc6544"
> -                      "ice_config"
> -                      "sip_config"
> -                      "fix_first_packet_turn_tcp"
> -                      "fix_ebusy_turn"
> -                      "ignore_ipv6_on_transport_check"
> -                      "fix_turn_connection_failure"
> -                      ;; "uwp_vs" ; for windows
> -                      "disable_local_resolution")))
> -               (mkdir-p savoir-faire-linux-patches-directory)
> -               (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
> -                       "-C" savoir-faire-linux-patches-directory
> -                       "--strip-components=5"
> -                       "ring-project/daemon/contrib/src/pjproject")
> -               (for-each
> -                (lambda (file)
> -                  (invoke "patch" "--force" "-p1" "-i"
> -                          (string-append savoir-faire-linux-patches-directory "/"
> -                                         file ".patch")))
> -                savoir-faire-linux-patches))
> -             #t))
> +             (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
> +               ;; Comes from
> +               ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
> +               ;; WARNING: These amount for huge changes in pjproject.
> +               (jami-apply-dependency-patches #:inputs inputs
> +                                              #:dep-name "pjproject"
> +                                              #:patches
> +                                              '("fix_turn_alloc_failure"
> +                                                "rfc2466"
> +                                                "ipv6"
> +                                                "multiple_listeners"
> +                                                "pj_ice_sess"
> +                                                "fix_turn_fallback"
> +                                                "fix_ioqueue_ipv6_sendto"
> +                                                "add_dtls_transport"
> +                                                "rfc6544"
> +                                                "ice_config"
> +                                                "sip_config"
> +                                                "fix_first_packet_turn_tcp"
> +                                                "fix_ebusy_turn"
> +                                                "ignore_ipv6_on_transport_check"
> +                                                "fix_turn_connection_failure"
> +                                                "disable_local_resolution"))
> +               #t)))
>           ;; TODO: We could use substitute-keyword-arguments instead of
>           ;; repeating the phases from pjproject, but somehow it does
>           ;; not work.

You can squash this patch with the previous one.

Mathieu