diff mbox series

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

Message ID 20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl
State Accepted
Headers show
Series [bug#40677,01/30] gnu: jami: Move Jami and its dependencies to jami.scm. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Jan Wielkiewicz April 17, 2020, 12:34 a.m. UTC 
---
 gnu/packages/jami.scm | 60 +++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

Comments

Mathieu Othacehe April 18, 2020, 12:27 p.m. UTC | #1 
> -             (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
diff mbox series

Patch

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 27f6ff26f5..b165335e26 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -131,6 +131,8 @@ 
              ;;   making a shared object;
              "CFLAGS=-fPIC"
              "CXXFLAGS=-fPIC")
+       #:modules ((guix build utils)
+		  ,@(@@ (guix build-system gnu) %default-modules))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-git-checkout-writable
@@ -139,40 +141,30 @@ 
              #t))
          (add-after 'unpack 'apply-patches
            (lambda* (#:key inputs #:allow-other-keys)
-             (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.