[PATCH 2/2] gnu: Add mcabber.

[PATCH 2/2] gnu: Add mcabber.

[ng0]

* gnu/packages/messaging.scm (mcabber): New variable.
---
 gnu/packages/messaging.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d6b0d4bbc..67b359d01 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
+  #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages base)
@@ -1150,4 +1151,35 @@ and yet extensible to let you do anything the Jabber protocol allows.")
     (synopsis "Asynchronous XMPP library")
     (license license:lgpl2.1)))
 
+(define-public mcabber
+  (package
+    (name "mcabber")
+    (version "1.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://mcabber.com/files/"
+                           name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gpgme" ,gpgme)
+       ("libotr" ,libotr)
+       ("aspell" ,aspell)
+       ("libidn" ,libidn)
+       ("glib" ,glib)
+       ("ncurses" ,ncurses)
+       ("loudmouth" ,loudmouth)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://about.psyc.eu/libpsyc")
+    (description
+     "Loudmouth is a lightweight and easy-to-use C library for programming
+with the Jabber protocol.  It's designed to be easy to get started with
+and yet extensible to let you do anything the Jabber protocol allows.")
+    (synopsis "Small XMPP console client")
+    (license license:gpl2)))
+
 ;;; messaging.scm ends here
-- 
2.11.0

Re: [PATCH 2/2] gnu: Add mcabber.

[Mark H Weaver]

Hi,

ng0 <ng0@libertad.pw> writes:

> * gnu/packages/messaging.scm (mcabber): New variable.
> ---
>  gnu/packages/messaging.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index d6b0d4bbc..67b359d01 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -37,6 +37,7 @@
>    #:use-module (guix build-system cmake)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages aidc)
> +  #:use-module (gnu packages aspell)
>    #:use-module (gnu packages autotools)
>    #:use-module (gnu packages avahi)
>    #:use-module (gnu packages base)
> @@ -1150,4 +1151,35 @@ and yet extensible to let you do anything the Jabber protocol allows.")
>      (synopsis "Asynchronous XMPP library")
>      (license license:lgpl2.1)))
>  
> +(define-public mcabber
> +  (package
> +    (name "mcabber")
> +    (version "1.0.4")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://mcabber.com/files/"
> +                           name "-" version ".tar.bz2"))
> +       (sha256
> +        (base32
> +         "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("gpgme" ,gpgme)
> +       ("libotr" ,libotr)
> +       ("aspell" ,aspell)
> +       ("libidn" ,libidn)
> +       ("glib" ,glib)
> +       ("ncurses" ,ncurses)
> +       ("loudmouth" ,loudmouth)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "http://about.psyc.eu/libpsyc")

This home-page seems incorrect.  Debian's mcabber package says that
<http://mcabber.com/> is its home page, which seems right.

> +    (description
> +     "Loudmouth is a lightweight and easy-to-use C library for programming
> +with the Jabber protocol.  It's designed to be easy to get started with
> +and yet extensible to let you do anything the Jabber protocol allows.")

This description field is apparently copied from the 'loudmouth'
package, and doesn't match this one.

> +    (synopsis "Small XMPP console client")
> +    (license license:gpl2)))

According to Debian's copyright file, the license is gpl2+, not gpl2.

     Mark

Re: [PATCH 2/2] gnu: Add mcabber.

[ng0]

Mark H Weaver <mhw@netris.org> writes:

> Hi,
>
> ng0 <ng0@libertad.pw> writes:
>
>> * gnu/packages/messaging.scm (mcabber): New variable.
>> ---
>>  gnu/packages/messaging.scm | 32 ++++++++++++++++++++++++++++++++
>>  1 file changed, 32 insertions(+)
>>
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index d6b0d4bbc..67b359d01 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -37,6 +37,7 @@
>>    #:use-module (guix build-system cmake)
>>    #:use-module (gnu packages)
>>    #:use-module (gnu packages aidc)
>> +  #:use-module (gnu packages aspell)
>>    #:use-module (gnu packages autotools)
>>    #:use-module (gnu packages avahi)
>>    #:use-module (gnu packages base)
>> @@ -1150,4 +1151,35 @@ and yet extensible to let you do anything the Jabber protocol allows.")
>>      (synopsis "Asynchronous XMPP library")
>>      (license license:lgpl2.1)))
>>  
>> +(define-public mcabber
>> +  (package
>> +    (name "mcabber")
>> +    (version "1.0.4")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "https://mcabber.com/files/"
>> +                           name "-" version ".tar.bz2"))
>> +       (sha256
>> +        (base32
>> +         "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"))))
>> +    (build-system gnu-build-system)
>> +    (inputs
>> +     `(("gpgme" ,gpgme)
>> +       ("libotr" ,libotr)
>> +       ("aspell" ,aspell)
>> +       ("libidn" ,libidn)
>> +       ("glib" ,glib)
>> +       ("ncurses" ,ncurses)
>> +       ("loudmouth" ,loudmouth)))
>> +    (native-inputs
>> +     `(("pkg-config" ,pkg-config)))
>> +    (home-page "http://about.psyc.eu/libpsyc")
>
> This home-page seems incorrect.  Debian's mcabber package says that
> <http://mcabber.com/> is its home page, which seems right.
>
>> +    (description
>> +     "Loudmouth is a lightweight and easy-to-use C library for programming
>> +with the Jabber protocol.  It's designed to be easy to get started with
>> +and yet extensible to let you do anything the Jabber protocol allows.")
>
> This description field is apparently copied from the 'loudmouth'
> package, and doesn't match this one.
>
>> +    (synopsis "Small XMPP console client")
>> +    (license license:gpl2)))
>
> According to Debian's copyright file, the license is gpl2+, not gpl2.
>
>      Mark
>

eh... woops. Okay, I thought I corrected it all, but either my
mind was not in the right place or I've sent an older revision.
I will send updates later today.

Thanks!
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

mcabber, corrections

[contact.ng0]

This corrects homepage, description, license and some other things I thought I had done when all I did was press send too early.

[PATCH 1/2] gnu: Add loudmouth.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/messaging.scm (loudmouth): New variable.
---
 gnu/packages/messaging.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2be3b0969..d6b0d4bbc 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 ng0 <ng0@libertad.pw>
+;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
 ;;;
@@ -1120,4 +1120,34 @@ Conferencing (PSYC).  psycLPC is a fork of LDMud with some new features and
 many bug fixes.")
     (license license:gpl2))))
 
+(define-public loudmouth
+  (package
+    (name "loudmouth")
+    (version "1.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://mcabber.com/files/loudmouth/"
+                           name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gnutls" ,gnutls)
+       ("glib" ,glib)
+       ("libidn" ,libidn)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("check" ,check)
+       ("glib" ,glib "bin") ; gtester
+       ("gtk-doc" ,gtk-doc)))
+    (home-page "http://mcabber.com/")
+    (description
+     "Loudmouth is a lightweight and easy-to-use C library for programming
+with the Jabber protocol.  It's designed to be easy to get started with
+and yet extensible to let you do anything the Jabber protocol allows.")
+    (synopsis "Asynchronous XMPP library")
+    (license license:lgpl2.1)))
+
 ;;; messaging.scm ends here
-- 
2.11.0

[PATCH 2/2] gnu: Add mcabber.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/messaging.scm (mcabber): New variable.
---
 gnu/packages/messaging.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d6b0d4bbc..bf351bdc2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
+  #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages base)
@@ -1150,4 +1151,36 @@ and yet extensible to let you do anything the Jabber protocol allows.")
     (synopsis "Asynchronous XMPP library")
     (license license:lgpl2.1)))
 
+(define-public mcabber
+  (package
+    (name "mcabber")
+    (version "1.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://mcabber.com/files/"
+                           name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gpgme" ,gpgme)
+       ("libotr" ,libotr)
+       ("aspell" ,aspell)
+       ("libidn" ,libidn)
+       ("glib" ,glib)
+       ("ncurses" ,ncurses)
+       ("loudmouth" ,loudmouth)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://mcabber.com")
+    (description
+     "Mcabber is a small XMPP (Jabber) console client, which includes features
+such as SASL and TLS support, @dfn{Multi-User Chat (MUC)} support, logging,
+command-completion, OpenPGP encryption, @dfn{Off-the-Record Messaging (OTR)}
+support, and more.")
+    (synopsis "Small XMPP console client")
+    (license license:gpl2+)))
+
 ;;; messaging.scm ends here
-- 
2.11.0

Re: [PATCH 1/2] gnu: Add loudmouth.

[Marius Bakke]

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

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/messaging.scm (loudmouth): New variable.
> ---
>  gnu/packages/messaging.scm | 32 +++++++++++++++++++++++++++++++-
>  1 file changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 2be3b0969..d6b0d4bbc 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -5,7 +5,7 @@
>  ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
>  ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
>  ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
> -;;; Copyright © 2016 ng0 <ng0@libertad.pw>
> +;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
>  ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
>  ;;;
> @@ -1120,4 +1120,34 @@ Conferencing (PSYC).  psycLPC is a fork of LDMud with some new features and
>  many bug fixes.")
>      (license license:gpl2))))
>  
> +(define-public loudmouth
> +  (package
> +    (name "loudmouth")
> +    (version "1.5.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://mcabber.com/files/loudmouth/"
> +                           name "-" version ".tar.bz2"))
> +       (sha256
> +        (base32
> +         "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("gnutls" ,gnutls)
> +       ("glib" ,glib)
> +       ("libidn" ,libidn)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("check" ,check)
> +       ("glib" ,glib "bin") ; gtester
> +       ("gtk-doc" ,gtk-doc)))
> +    (home-page "http://mcabber.com/")
> +    (description
> +     "Loudmouth is a lightweight and easy-to-use C library for programming
> +with the Jabber protocol.  It's designed to be easy to get started with
> +and yet extensible to let you do anything the Jabber protocol allows.")
> +    (synopsis "Asynchronous XMPP library")
> +    (license license:lgpl2.1)))

I made the same license observation as Mark and corrected it. Also did
s/Jabber/XMPP in the description. Pushed!

> +
>  ;;; messaging.scm ends here
> -- 
> 2.11.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 2/2] gnu: Add mcabber.

[Marius Bakke]

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

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/messaging.scm (mcabber): New variable.
> ---
>  gnu/packages/messaging.scm | 33 +++++++++++++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index d6b0d4bbc..bf351bdc2 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -37,6 +37,7 @@
>    #:use-module (guix build-system cmake)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages aidc)
> +  #:use-module (gnu packages aspell)
>    #:use-module (gnu packages autotools)
>    #:use-module (gnu packages avahi)
>    #:use-module (gnu packages base)
> @@ -1150,4 +1151,36 @@ and yet extensible to let you do anything the Jabber protocol allows.")
>      (synopsis "Asynchronous XMPP library")
>      (license license:lgpl2.1)))
>  
> +(define-public mcabber
> +  (package
> +    (name "mcabber")
> +    (version "1.0.4")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://mcabber.com/files/"
> +                           name "-" version ".tar.bz2"))
> +       (sha256
> +        (base32
> +         "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("gpgme" ,gpgme)
> +       ("libotr" ,libotr)
> +       ("aspell" ,aspell)
> +       ("libidn" ,libidn)
> +       ("glib" ,glib)
> +       ("ncurses" ,ncurses)
> +       ("loudmouth" ,loudmouth)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "http://mcabber.com")
> +    (description
> +     "Mcabber is a small XMPP (Jabber) console client, which includes features
> +such as SASL and TLS support, @dfn{Multi-User Chat (MUC)} support, logging,
> +command-completion, OpenPGP encryption, @dfn{Off-the-Record Messaging (OTR)}
> +support, and more.")
> +    (synopsis "Small XMPP console client")
> +    (license license:gpl2+)))

AFAICT the parenthesis comes after @dfn{...}. I also noticed libotr and
aspell was not referenced, and had to explicitly enable them as
configure flags. Home page was corrected to HTTPS too. Pushed!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]