Subject: Re: [bug#29295] [PATCH] Few small patches for messaging.

From: Rutger Helling <[email-masked]>
Date: Thu, 16 Nov 2017 11:10:32 +0100

I'm re-sending these patches just in case since the copyright notice
already got merged in a different patch just now. 

On 2017-11-14 16:52, ng0 wrote:

> Rutger Helling transcribed 8.8K bytes: 
> 
>> Hey Guix, 
>> 
>> here's a few small patches for messaging.scm: 
>> 
>> #1 - A copyright notice.
> 
> Can you combine patch 1 and patch 2? This
> way your copyright line is attached to code
> it was added for.
> 
>> #2 - An update for c-toxcore to 0.1.10.
>> #3 - Add filteraudio to qtox inputs.
>> #4 - Add python2-axolotl to gajim inputs (needed for the OMEMO plugin).
>> #5 - An update for prosody to 0.10.0.
> 
>> From 5a868eb614f9d1fbd607b9239153be2fe0327154 Mon Sep 17 00:00:00 2001
>> From: Rutger Helling <[email-masked]>
>> Date: Tue, 14 Nov 2017 15:16:34 +0100
>> Subject: [PATCH] gnu: messaging: Add copyright notice.
>> 
>> * gnu/packages/messaging.scm: Add copyright notice.
>> ---
>> gnu/packages/messaging.scm | 1 +
>> 1 file changed, 1 insertion(+)
>> 
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 72dbbcd1e..28ff42825 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -12,6 +12,7 @@
>> ;;; Copyright (c) 2017 Arun Isaac <[email-masked]>
>> ;;; Copyright (c) 2017 Tobias Geerinckx-Rice <[email-masked]>
>> ;;; Copyright (c) 2017 Theodoros Foradis <[email-masked]>
>> +;;; Copyright (c) 2017 Rutger Helling <[email-masked]>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> -- 
>> 2.15.0
> 
>> From 1e82e72392aeef94a7c182b9d35d99a595440afb Mon Sep 17 00:00:00 2001
>> From: Rutger Helling <[email-masked]>
>> Date: Mon, 13 Nov 2017 22:39:38 +0100
>> Subject: [PATCH] gnu: c-toxcore: Update to 0.1.10.
>> 
>> * gnu/packages/messaging.scm (c-toxcore): Update to 0.1.10.
>> ---
>> gnu/packages/messaging.scm | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 9af00dce2..16ed2380b 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -761,7 +761,7 @@ protocols.")
>> (define-public c-toxcore
>> (package
>> (name "c-toxcore")
>> -    (version "0.1.9")
>> +    (version "0.1.10")
>> (source
>> (origin
>> (method url-fetch)
>> @@ -770,7 +770,7 @@ protocols.")
>> (file-name (string-append name "-" version ".tar.gz"))
>> (sha256
>> (base32
>> -         "1y30xc1dzq9knww274d4y0m8gridcf5j851rxdri8j2s64p3qqgk"))))
>> +         "1lbvq9pp1ganjk5lql5lzcn8bcmgfi8y026pb2j2nq8yldqrrjby"))))
>> (build-system cmake-build-system)
>> (native-inputs
>> `(("pkg-config" ,pkg-config)))
>> -- 
>> 2.15.0
> 
>> From e88182c79be5b7792c4c5a19c2226813297b5e2d Mon Sep 17 00:00:00 2001
>> From: Rutger Helling <[email-masked]>
>> Date: Tue, 14 Nov 2017 09:00:17 +0100
>> Subject: [PATCH] gnu: qtox: Add filteraudio to inputs.
>> 
>> * gnu/packages/messaging.scm (qtox)[inputs]: Add filteraudio.
>> ---
>> gnu/packages/messaging.scm | 1 +
>> 1 file changed, 1 insertion(+)
>> 
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 16ed2380b..d384d8ee0 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -860,6 +860,7 @@ instant messenger with audio and video chat capabilities.")
>> #t)))))
>> (inputs
>> `(("ffmpeg" ,ffmpeg-3.3)
>> +       ("filteraudio", filteraudio)
>> ("glib" ,glib)
>> ("gtk+" ,gtk+-2)
>> ("libsodium" ,libsodium)
>> -- 
>> 2.15.0
> 
>> From 4de4398248c91b335c7ae1003d7dbcd5e0262bee Mon Sep 17 00:00:00 2001
>> From: Rutger Helling <[email-masked]>
>> Date: Thu, 9 Nov 2017 10:02:32 +0100
>> Subject: [PATCH] gnu: gajim: Add python2-axolotl to inputs.
>> 
>> * gnu/packages/messaging.scm (gajim)[inputs]: Add python2-axolotl.
>> ---
>> gnu/packages/messaging.scm | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 72dbbcd1e..9f1d67bbe 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -519,7 +519,8 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
>> (native-inputs
>> `(("intltool" ,intltool)))
>> (inputs
>> -     `(("python2-nbxmpp" ,python2-nbxmpp)
>> +     `(("python2-axolotl" ,python2-axolotl)
>> +       ("python2-nbxmpp" ,python2-nbxmpp)
>> ("python2-pyopenssl" ,python2-pyopenssl)
>> ("python2-gnupg" ,python2-gnupg)
>> ("python2-pygtk" ,python2-pygtk)
>> -- 
>> 2.15.0
> 
>> From f6ce3f9ac880905349f1a5ef6251b94ccdb490fa Mon Sep 17 00:00:00 2001
>> From: Rutger Helling <[email-masked]>
>> Date: Thu, 9 Nov 2017 14:02:29 +0100
>> Subject: [PATCH] gnu: prosody: Update to 0.10.0
>> 
>> ---
>> gnu/packages/messaging.scm | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 95074ef4c..9af00dce2 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -627,14 +627,14 @@ a graphical desktop environment like GNOME.")
>> (define-public prosody
>> (package
>> (name "prosody")
>> -    (version "0.9.12")
>> +    (version "0.10.0")
>> (source (origin
>> (method url-fetch)
>> (uri (string-append "https://prosody.im/downloads/source/"
>> "prosody-" version ".tar.gz"))
>> (sha256
>> (base32
>> -                "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"))))
>> +                "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l"))))
>> (build-system gnu-build-system)
>> (arguments
>> `(#:tests? #f ; no "check" target
>> -- 
>> 2.15.0

From 1e82e72392aeef94a7c182b9d35d99a595440afb Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Mon, 13 Nov 2017 22:39:38 +0100
Subject: [PATCH] gnu: c-toxcore: Update to 0.1.10.

* gnu/packages/messaging.scm (c-toxcore): Update to 0.1.10.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 9af00dce2..16ed2380b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -761,7 +761,7 @@ protocols.")
 (define-public c-toxcore
   (package
     (name "c-toxcore")
-    (version "0.1.9")
+    (version "0.1.10")
     (source
      (origin
        (method url-fetch)
@@ -770,7 +770,7 @@ protocols.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1y30xc1dzq9knww274d4y0m8gridcf5j851rxdri8j2s64p3qqgk"))))
+         "1lbvq9pp1ganjk5lql5lzcn8bcmgfi8y026pb2j2nq8yldqrrjby"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.15.0

From e88182c79be5b7792c4c5a19c2226813297b5e2d Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Tue, 14 Nov 2017 09:00:17 +0100
Subject: [PATCH] gnu: qtox: Add filteraudio to inputs.

* gnu/packages/messaging.scm (qtox)[inputs]: Add filteraudio.
---
 gnu/packages/messaging.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 16ed2380b..d384d8ee0 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -860,6 +860,7 @@ instant messenger with audio and video chat capabilities.")
              #t)))))
     (inputs
      `(("ffmpeg" ,ffmpeg-3.3)
+       ("filteraudio", filteraudio)
        ("glib" ,glib)
        ("gtk+" ,gtk+-2)
        ("libsodium" ,libsodium)
-- 
2.15.0

From 4de4398248c91b335c7ae1003d7dbcd5e0262bee Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Thu, 9 Nov 2017 10:02:32 +0100
Subject: [PATCH] gnu: gajim: Add python2-axolotl to inputs.

* gnu/packages/messaging.scm (gajim)[inputs]: Add python2-axolotl.
---
 gnu/packages/messaging.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 72dbbcd1e..9f1d67bbe 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -519,7 +519,8 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
     (native-inputs
      `(("intltool" ,intltool)))
     (inputs
-     `(("python2-nbxmpp" ,python2-nbxmpp)
+     `(("python2-axolotl" ,python2-axolotl)
+       ("python2-nbxmpp" ,python2-nbxmpp)
        ("python2-pyopenssl" ,python2-pyopenssl)
        ("python2-gnupg" ,python2-gnupg)
        ("python2-pygtk" ,python2-pygtk)
-- 
2.15.0

From f6ce3f9ac880905349f1a5ef6251b94ccdb490fa Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Thu, 9 Nov 2017 14:02:29 +0100
Subject: [PATCH] gnu: prosody: Update to 0.10.0

---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 95074ef4c..9af00dce2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -627,14 +627,14 @@ a graphical desktop environment like GNOME.")
 (define-public prosody
   (package
     (name "prosody")
-    (version "0.9.12")
+    (version "0.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://prosody.im/downloads/source/"
                                   "prosody-" version ".tar.gz"))
               (sha256
                (base32
-                "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"))))
+                "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no "check" target
-- 
2.15.0