GNU bug report logs - #31382
[PATCH] telephony: add twinkle

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31382 in the body.
You can then email your comments to 31382 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] telephony: add twinkle
Date: Mon, 7 May 2018 17:35:23 -0500

From 1a2504b36e0775443587faf43e3a2d9467769866 Mon Sep 17 00:00:00 2001
From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Date: Mon, 7 May 2018 17:32:57 -0500
Subject: [PATCH] telephony: add twinkle

---
 gnu/packages/telephony.scm | 66 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5210e73ed..fe763c517 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016, 2017 Nils Gillmann <ng0 <at> n0.is>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2018 Jovany Leandro G.C <bit4bit <at> riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,9 +43,14 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu))
 
 (define-public commoncpp
@@ -482,3 +488,63 @@ Mumble consists of two applications for separate usage:
     (license (list license:bsd-3
                    ;; The bundled celt is bsd-2. Remove after 1.3.0.
                    license:bsd-2))))
+
+(define-public twinkle
+  (let ((commit "02e1d1538af3337134bd7381dcd95f8d7775b30f")
+        (revision "1"))
+  (package
+   (name "twinkle")
+   (version (git-version "1.10.1" revision commit))
+   (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/LubosD/twinkle")
+                   (commit commit)))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "0ds4rp4vr1wagn4m4m7ldqbsx5vgmgbfcqqgyhn1wf6s1dm0020z"))))
+   (build-system cmake-build-system)
+   (arguments
+    `(#:tests? #f ; no test target
+      #:phases
+      (modify-phases %standard-phases
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/twinkle")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtdeclarative")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtdeclarative" "qtquickcontrols"))))
+               #t))))))
+   (native-inputs
+    `(("bison" ,bison)
+      ("flex" ,flex)
+      ("readline" ,readline)
+      ("file" ,file)
+      ("ucommon" ,ucommon)
+      ("ccrtp" ,ccrtp)
+      ("libxml2" ,libxml2)
+      ("speex" ,speex)
+      ("speexdsp" ,speexdsp)
+      ("libsndfile" ,libsndfile)
+      ("alsa-lib" ,alsa-lib)
+      ("qttools" ,qttools)))
+   (inputs
+    `(("qtbase" ,qtbase)
+      ("qtdeclarative" ,qtdeclarative)
+      ("qtquickcontrols" ,qtquickcontrols)))
+   (home-page "http://twinkle.dolezel.info/")
+   (synopsis "Softphone for your voice over IP and instant messaging communcations")
+   (description "Twinkle is a softphone for your voice over IP and instant
+messaging communcations using the SIP protocol.  You can use it for direct IP
+phone to IP phone communication or in a network using a SIP proxy to route your
+calls and messages")
+   (license license:gpl2))))
-- 
2.17.0

Message #10 received at 31382-done <at> debbugs.gnu.org (full text, mbox):

From: Eric Bavier <ericbavier <at> centurylink.net>
To: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Cc: 31382-done <at> debbugs.gnu.org
Subject: Re: [bug#31382] [PATCH] telephony: add twinkle
Date: Tue, 8 May 2018 22:14:35 -0500

[Message part 1 (text/plain, inline)]

Hello Jovany,

On Mon, 7 May 2018 17:35:23 -0500
"Jovany Leandro G.C" <bit4bit <at> riseup.net> wrote:

> From 1a2504b36e0775443587faf43e3a2d9467769866 Mon Sep 17 00:00:00 2001
> From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
> Date: Mon, 7 May 2018 17:32:57 -0500
> Subject: [PATCH] telephony: add twinkle
> 
> ---
>  gnu/packages/telephony.scm | 66 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 66 insertions(+)

LGTM.  It even builds with --check/--rounds ! :)   Thanks.

I pushed this in commit b61cb24492c150b5eebb5227f2a7c32e4d42e1d4 with
the slight modifications below:


diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index fe763c517..40e57051e 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
@@ -51,6 +52,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu))
 
 (define-public commoncpp
@@ -542,9 +544,9 @@ Mumble consists of two applications for separate usage:
       ("qtdeclarative" ,qtdeclarative)
       ("qtquickcontrols" ,qtquickcontrols)))
    (home-page "http://twinkle.dolezel.info/")
-   (synopsis "Softphone for your voice over IP and instant messaging communcations")
+   (synopsis "Softphone for voice over IP and instant messaging")
    (description "Twinkle is a softphone for your voice over IP and instant
 messaging communcations using the SIP protocol.  You can use it for direct IP
 phone to IP phone communication or in a network using a SIP proxy to route your
 calls and messages")
-   (license license:gpl2))))
+   (license license:gpl2+))))

[Message part 2 (application/pgp-signature, inline)]

Message #13 received at 31382 <at> debbugs.gnu.org (full text, mbox):

From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
To: 31382 <at> debbugs.gnu.org
Subject: [PATCH] telephony: twinkle fix support for codec speex
Date: Wed, 9 May 2018 15:22:40 -0500

From 805dff3d4a5460e072dbede7abb2049c64e1453b Mon Sep 17 00:00:00 2001
From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Date: Wed, 9 May 2018 15:15:54 -0500
Subject: [PATCH] telephony: twinkle fix support for codec speex

---
 gnu/packages/telephony.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 40e57051e..6b625b5d3 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -509,6 +509,7 @@ Mumble consists of two applications for separate usage:
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f ; no test target
+      #:configure-flags '("-DWITH_SPEEX=On")
       #:phases
       (modify-phases %standard-phases
          (add-after 'install 'wrap-executable
-- 
2.17.0

Message #16 received at 31382 <at> debbugs.gnu.org (full text, mbox):

From: Eric Bavier <ericbavier <at> centurylink.net>
To: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
Cc: 31382 <at> debbugs.gnu.org
Subject: Re: [bug#31382] [PATCH] telephony: twinkle fix support for codec speex
Date: Wed, 9 May 2018 20:46:21 -0500

[Message part 1 (text/plain, inline)]

On Wed, 9 May 2018 15:22:40 -0500
"Jovany Leandro G.C" <bit4bit <at> riseup.net> wrote:

> From 805dff3d4a5460e072dbede7abb2049c64e1453b Mon Sep 17 00:00:00 2001
> From: "Jovany Leandro G.C" <bit4bit <at> riseup.net>
> Date: Wed, 9 May 2018 15:15:54 -0500
> Subject: [PATCH] telephony: twinkle fix support for codec speex
> 
> ---
>  gnu/packages/telephony.scm | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
> index 40e57051e..6b625b5d3 100644
> --- a/gnu/packages/telephony.scm
> +++ b/gnu/packages/telephony.scm
> @@ -509,6 +509,7 @@ Mumble consists of two applications for separate usage:
>     (build-system cmake-build-system)
>     (arguments
>      `(#:tests? #f ; no test target
> +      #:configure-flags '("-DWITH_SPEEX=On")
>        #:phases
>        (modify-phases %standard-phases
>           (add-after 'install 'wrap-executable

Pushed in 81dec5967a1a6dbf1bfbc4b2fd9cf7546349bbfe with a commit
message that better fits our standards.

Thanks!

`~Eric

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.