[bug#40264] Mirror and Formatting

["Raghav Gururajan" <raghavgururajan@disroot.org>]

[-- Attachment #1: Type: text/plain, Size: 2 bytes --]



[-- Attachment #2: 0001-download-Add-linphone.patch --]
[-- Type: application/octet-stream, Size: 1231 bytes --]

From 090bb3e3f05fc678217903c07a7f723bdfde9240 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:51:26 -0400
Subject: [PATCH 1/3] download: Add linphone.

* guix/download.scm (%mirrors): Add linphone.
---
 guix/download.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/guix/download.scm b/guix/download.scm
index 91a2b4ce5f..afc81868da 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -361,6 +362,10 @@
        "https://ftp4.usa.openbsd.org/pub/OpenBSD/"
        "https://ftp5.usa.openbsd.org/pub/OpenBSD/"
        "https://mirror.esc7.net/pub/OpenBSD/")
+      (linphone
+       "https://linphone.org/releases/"
+       "https://linphone.org/releases/sources/"
+       "https://linphone.org/releases/sources/plugins/")
       (mate
        "https://pub.mate-desktop.org/releases/"
        "http://pub.mate-desktop.org/releases/"))))
-- 
2.26.0


[-- Attachment #3: 0002-gnu-linphone-Replace-source-URI-with-mirror.patch --]
[-- Type: application/octet-stream, Size: 7480 bytes --]

From a2a4099994e21087cca9149a70d18186bfba7411 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:53:06 -0400
Subject: [PATCH 2/3] gnu: linphone: Replace source URI with mirror.

* gnu/packages/linphone.scm: Replace source URI with mirror.
---
 gnu/packages/linphone.scm | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 50d75a4a95..39109ff877 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -59,7 +59,7 @@
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
@@ -84,7 +84,7 @@ framework for writing, administering, and running unit tests in C.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
@@ -111,7 +111,7 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
@@ -138,7 +138,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
@@ -164,7 +164,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
@@ -196,7 +196,7 @@ picture, or subtitle tracks in one file. ")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
@@ -223,7 +223,7 @@ such as conferencing.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
@@ -252,7 +252,7 @@ implements the RFC 3550 standard.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
@@ -281,7 +281,7 @@ platforms including both ARM and x86.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
@@ -315,14 +315,14 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
 
 (define-public mediastreamer2
   (package
-    (name "mediastreamer2")
+    (name "mediastreamer")
     (version "2.16.1")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/"
-                       "mediastreamer/mediastreamer-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
        (patches (search-patches "mediastreamer2-srtp2.patch"))))
@@ -405,14 +405,14 @@ decoding, and rendering.")
 
 (define-public liblinphone
   (package
-    (name "liblinphone")
+    (name "linphone")
     (version "3.12.0")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/linphone"
-                       "/linphone-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
     (build-system cmake-build-system)
@@ -477,8 +477,8 @@ and video calls or instant messaging capabilities to an application.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
        (patches
@@ -516,8 +516,8 @@ mediastreamer2 based on the openh264 library.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
     (build-system cmake-build-system)
@@ -543,8 +543,8 @@ AMR codec.  It is based on the Skype's SILK implementation.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
     (build-system cmake-build-system)
@@ -571,8 +571,8 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
     (build-system cmake-build-system)
-- 
2.26.0


[-- Attachment #4: 0003-gnu-linphone-Fix-formatting.patch --]
[-- Type: application/octet-stream, Size: 9962 bytes --]

From 5b3dc89e93749fb4ff1e2d246db20e61a54e6232 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 03:28:07 -0400
Subject: [PATCH 3/3] gnu: linphone: Fix formatting.

* gnu/packages/linphone.scm: Fix formatting.
---
 gnu/packages/linphone.scm | 84 ++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 39109ff877..0e3281de4b 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -70,9 +70,9 @@
        (list
         "-DENABLE_STATIC=NO")))         ; Not required
     (synopsis "Belledonne Communications Unit Testing Framework")
-    (description "BCUnit is a fork of the defunct project CUnit,
-with several fixes and patches applied.  It is an unit testing
-framework for writing, administering, and running unit tests in C.")
+    (description "BCUnit is a fork of the defunct project CUnit, with several
+fixes and patches applied.  It is an unit testing framework for writing,
+administering, and running unit tests in C.")
     (home-page "https://gitlab.linphone.org/BC/public/bcunit")
     (license license:lgpl2.0+)))
 
@@ -124,9 +124,10 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
     (inputs
      `(("bctoolbox" ,bctoolbox)))
     (synopsis "Belledonne Communications Language Recognition Library")
-    (description "Belr is Belledonne Communications' language recognition library,
-written in C++11.  It parses text inputs formatted according to a language
-defined by an ABNF grammar, such as the protocols standardized at IETF.")
+    (description "Belr is Belledonne Communications' language recognition
+library, written in C++11.  It parses text inputs formatted according to a
+language defined by an ABNF grammar, such as the protocols standardized at
+IETF.")
     (home-page "https://gitlab.linphone.org/BC/public/belr")
     (license license:gpl3+)))
 
@@ -152,7 +153,8 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      `(("bctoolbox" ,bctoolbox)
        ("belr" ,belr)))
     (synopsis "Belledonne Communications VCard Library")
-    (description "Belcard is a C++ library to manipulate VCard standard format.")
+    (description "Belcard is a C++ library to manipulate VCard standard
+format.")
     (home-page "https://gitlab.linphone.org/BC/public/belcard")
     (license license:gpl3+)))
 
@@ -175,16 +177,16 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
        (list
         "-DENABLE_STATIC=NO")))         ; Not required
     (synopsis "Belledonne Communications Media Container")
-    (description "BcMatroska is a free and open standard multi-media
-container format.  It can hold an unlimited number of video, audio,
-picture, or subtitle tracks in one file. ")
+    (description "BcMatroska is a free and open standard multi-media container
+format.  It can hold an unlimited number of video, audio, picture, or subtitle
+tracks in one file. ")
     (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
     (license
      (list
-      ;; That license applies for Core C and LibEBML2.
+      ;; For Core C and LibEBML2.
       ;; https://www.matroska.org/node/47
       license:bsd-4
-      ;; That license applies for LibMatroska2.
+      ;; For LibMatroska2.
       ;; https://www.matroska.org/node/47
       license:lgpl2.1+))))
 
@@ -261,15 +263,15 @@ implements the RFC 3550 standard.")
      `(#:tests? #f                      ; No test target
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")))
+        "-DENABLE_STATIC=NO")))         ; Not required
     (inputs
      `(("bctoolbox" ,bctoolbox)
        ("sqlite3" ,sqlite)
        ("xml2" ,libxml2)))
     (synopsis "Belledonne Communications ZRTP Library")
-    (description "BZRTP is an implementation of ZRTP keys exchange
-protocol, written in C.  It is fully portable and can be executed on many
-platforms including both ARM and x86.")
+    (description "BZRTP is an implementation of ZRTP keys exchange protocol,
+written in C.  It is fully portable and can be executed on many platforms
+including both ARM and x86.")
     (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
     (license license:gpl2+)))
 
@@ -290,15 +292,15 @@ platforms including both ARM and x86.")
      `(#:tests? #f                      ; Requires network access
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")
+        "-DENABLE_STATIC=NO")           ; Not required
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch
            (lambda _
              (substitute* "src/CMakeLists.txt"
-              ;; ANTLR would use multithreaded DFA generation
-              ;; otherwise--which would not be reproducible.
-              (("-Xmultithreaded ") ""))
+               ;; ANTLR would use multithreaded DFA generation otherwise,
+               ;; which would not be reproducible.
+               (("-Xmultithreaded ") ""))
              #t)))))
     (inputs
      `(("antlr3" ,antlr3-3.3)
@@ -325,7 +327,8 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
-       (patches (search-patches "mediastreamer2-srtp2.patch"))))
+       (patches
+        (search-patches "mediastreamer2-srtp2.patch"))))
     (outputs '("out" "doc" "tester"))
     (build-system cmake-build-system)
     (arguments
@@ -393,13 +396,12 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
        ("vpx" ,libvpx)
        ("x11" ,libx11)
        ("xv" ,libxv)
-       ("zrtp", bzrtp)))
+       ("zrtp" ,bzrtp)))
     (synopsis "Belledonne Communications Streaming Engine")
-    (description "Mediastreamer2 is a powerful and lightweight
-streaming engine for telephony applications.  This media processing
-and streaming toolkit is responsible for receiving and sending all
-multimedia streams in Linphone, including media capture, encoding and
-decoding, and rendering.")
+    (description "Mediastreamer2 is a powerful and lightweight streaming engine
+for telephony applications.  This media processing and streaming toolkit is
+responsible for receiving and sending all multimedia streams in Linphone,
+including media capture, encoding and decoding, and rendering.")
     (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
     (license license:gpl2+)))
 
@@ -461,11 +463,11 @@ decoding, and rendering.")
     (propagated-inputs
      `(("murrine" ,murrine)))           ; Required for GTK UI
     (synopsis "Belledonne Communications Softphone Library")
-    (description "Liblinphone is a high-level SIP library integrating
-all calling and instant messaging features into an unified
-easy-to-use API.  It is the cross-platform VoIP library on which the
-Linphone application is based on, and that anyone can use to add audio
-and video calls or instant messaging capabilities to an application.")
+    (description "Liblinphone is a high-level SIP library integrating all
+calling and instant messaging features into an unified easy-to-use API.  It is
+the cross-platform VoIP library on which the Linphone application is based on,
+and that anyone can use to add audio and video calls or instant messaging
+capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
 
@@ -487,11 +489,13 @@ and video calls or instant messaging capabilities to an application.")
          (origin
            (method url-fetch)
            (uri
-            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
-                           "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
+            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/"
+                           "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326"
+                           ".diff"))
            (file-name "msopenh264-openh264.patch")
            (sha256
-            (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
+            (base32
+             "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; No test target
@@ -530,8 +534,8 @@ mediastreamer2 based on the openh264 library.")
      `(("mediastreamer2" ,mediastreamer2)
        ("ortp" ,ortp)))
     (synopsis "Media Streamer SILK Codec")
-    (description "MSSILK is a plugin of MediaStreamer, adding support for
-AMR codec.  It is based on the Skype's SILK implementation.")
+    (description "MSSILK is a plugin of MediaStreamer, adding support for AMR
+codec.  It is based on the Skype's SILK implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/mssilk")
     (license license:gpl2+)))
 
@@ -552,7 +556,7 @@ AMR codec.  It is based on the Skype's SILK implementation.")
      `(#:tests? #f                      ; No test target
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")))
+        "-DENABLE_STATIC=NO")))         ; Not required
     (inputs
      `(("bctoolbox" ,bctoolbox)
        ("mediastreamer2" ,mediastreamer2)
@@ -588,7 +592,7 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
        ("ortp" ,ortp)
        ("voamrwbenc" ,vo-amrwbenc)))
     (synopsis "Media Streamer AMR Codec")
-    (description "MSAMR is a plugin of MediaStreamer, adding support for
-AMR codec.  It is based on the opencore-amr implementation.")
+    (description "MSAMR is a plugin of MediaStreamer, adding support for AMR
+codec.  It is based on the opencore-amr implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/msamr")
     (license license:gpl3+)))
-- 
2.26.0