Package: guix-patches;
Reported by: "Raghav Gururajan" <raghavgururajan <at> disroot.org>
Date: Fri, 27 Mar 2020 23:11:01 UTC
Severity: normal
Done: maxim.cournoyer <at> gmail.com
Bug is archived. No further changes may be made.
Message #313 received at 40264-done <at> debbugs.gnu.org (full text, mbox):
From: maxim.cournoyer <at> gmail.com To: "Raghav Gururajan" <raghavgururajan <at> disroot.org> Cc: 40264-done <at> debbugs.gnu.org Subject: Re: [bug#40264] Mirror and Formatting Date: Thu, 16 Apr 2020 00:49:08 -0400
Hello Raghav,
"Raghav Gururajan" <raghavgururajan <at> disroot.org> writes:
> From 5b3dc89e93749fb4ff1e2d246db20e61a54e6232 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan <at> 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+)))
Please not that we usually submit changes *per-package*, that is, one
commit per package. It's a convention we use. I'm making an exception
here because the changes are cosmetic only, but keep this in mind for
your next changes.
I've pushed a slightly modified version of the above changes in commit
1988ef21f82430d4b380dd4887160a902d8796fd (on the core-updates branch).
Thank you for your contributions and your patience in the lengthy review
process.
Maxim
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.