From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:40977)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jPmZn-0003Ts-1C
 for guix-patches@gnu.org; Sat, 18 Apr 2020 08:28:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jPmZl-0006t4-UY
 for guix-patches@gnu.org; Sat, 18 Apr 2020 08:28:02 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:58792)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jPmZl-0006sG-QH
 for guix-patches@gnu.org; Sat, 18 Apr 2020 08:28:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jPmZl-0003Q3-NN
 for guix-patches@gnu.org; Sat, 18 Apr 2020 08:28:01 -0400
Subject: [bug#40677] [PATCH 05/30] gnu: pjproject-jami: Use the
 jami-apply-dependency-patches procedure.
Resent-Message-ID: <handler.40677.B40677.158721283313084@debbugs.gnu.org>
From: Mathieu Othacehe <m.othacehe@gmail.com>
References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl>
 <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl>
Date: Sat, 18 Apr 2020 14:27:04 +0200
In-Reply-To: <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl> (Jan
 Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:08 +0200")
Message-ID: <87a739j7xj.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Cc: 40677@debbugs.gnu.org


> -             (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