unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 1/2] gnu: Add loudmouth.
  2017-01-16 20:45 Add: mcabber xmpp client ng0
@ 2017-01-16 20:45 ` ng0
  2017-01-17  9:56   ` Mark H Weaver
  0 siblings, 1 reply; 10+ messages in thread
From: ng0 @ 2017-01-16 20:45 UTC (permalink / raw)
  To: guix-devel

* 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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add loudmouth.
  2017-01-16 20:45 ` [PATCH 1/2] gnu: Add loudmouth ng0
@ 2017-01-17  9:56   ` Mark H Weaver
  2017-01-18 12:20     ` ng0
  0 siblings, 1 reply; 10+ messages in thread
From: Mark H Weaver @ 2017-01-17  9:56 UTC (permalink / raw)
  To: ng0; +Cc: guix-devel

ng0 <ng0@libertad.pw> writes:

> * 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)))

According to Debian, the license is lgpl2.0+.  Can you check this again?

      Mark

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add loudmouth.
  2017-01-17  9:56   ` Mark H Weaver
@ 2017-01-18 12:20     ` ng0
  2017-01-18 19:16       ` Mark H Weaver
  0 siblings, 1 reply; 10+ messages in thread
From: ng0 @ 2017-01-18 12:20 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: guix-devel

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

> ng0 <ng0@libertad.pw> writes:
>
>> * 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)))
>
> According to Debian, the license is lgpl2.0+.  Can you check this again?
>
>       Mark
>

Sorry for all the mistakes, I wasn't very present when I wrote
this.
But, the license is correct. I haven't looked at debian because I
have the source, and it is 2.1 here.

Updated patches coming any minute.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

^ permalink raw reply	[flat|nested] 10+ messages in thread

* mcabber, corrections
@ 2017-01-18 12:34 contact.ng0
  2017-01-18 12:34 ` [PATCH 1/2] gnu: Add loudmouth contact.ng0
  2017-01-18 12:34 ` [PATCH 2/2] gnu: Add mcabber contact.ng0
  0 siblings, 2 replies; 10+ messages in thread
From: contact.ng0 @ 2017-01-18 12:34 UTC (permalink / raw)
  To: guix-devel

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/2] gnu: Add loudmouth.
  2017-01-18 12:34 mcabber, corrections contact.ng0
@ 2017-01-18 12:34 ` contact.ng0
  2017-01-18 19:26   ` Marius Bakke
  2017-01-18 12:34 ` [PATCH 2/2] gnu: Add mcabber contact.ng0
  1 sibling, 1 reply; 10+ messages in thread
From: contact.ng0 @ 2017-01-18 12:34 UTC (permalink / raw)
  To: guix-devel; +Cc: 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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 2/2] gnu: Add mcabber.
  2017-01-18 12:34 mcabber, corrections contact.ng0
  2017-01-18 12:34 ` [PATCH 1/2] gnu: Add loudmouth contact.ng0
@ 2017-01-18 12:34 ` contact.ng0
  2017-01-18 19:28   ` Marius Bakke
  1 sibling, 1 reply; 10+ messages in thread
From: contact.ng0 @ 2017-01-18 12:34 UTC (permalink / raw)
  To: guix-devel; +Cc: 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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add loudmouth.
  2017-01-18 12:20     ` ng0
@ 2017-01-18 19:16       ` Mark H Weaver
  2017-01-18 20:37         ` ng0
  0 siblings, 1 reply; 10+ messages in thread
From: Mark H Weaver @ 2017-01-18 19:16 UTC (permalink / raw)
  To: ng0; +Cc: guix-devel

ng0 <contact.ng0@cryptolab.net> writes:

> Mark H Weaver <mhw@netris.org> writes:
>
>> ng0 <ng0@libertad.pw> writes:
>>
>>> * 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)))
>>
>> According to Debian, the license is lgpl2.0+.  Can you check this again?
>>
>>       Mark
>>
>
> Sorry for all the mistakes, I wasn't very present when I wrote
> this.
> But, the license is correct. I haven't looked at debian because I
> have the source, and it is 2.1 here.

I just looked, and the source files say this:

  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public License as
  published by the Free Software Foundation; either version 2 of the
  License, or (at your option) any later version.

That means lgpl2.0+, as the Debian maintainer concluded.

Have you been concluding the licenses based solely on the COPYING file
(or similar) present in the tarball?  If so, you may have been getting
it wrong for a long time.  The copyright notices in the source files are
the relevant thing to check.  I usually check Debian's copyright files,
since they've already done the hard work.

     Thanks,
       Mark

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add loudmouth.
  2017-01-18 12:34 ` [PATCH 1/2] gnu: Add loudmouth contact.ng0
@ 2017-01-18 19:26   ` Marius Bakke
  0 siblings, 0 replies; 10+ messages in thread
From: Marius Bakke @ 2017-01-18 19:26 UTC (permalink / raw)
  To: contact.ng0, guix-devel; +Cc: ng0

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/2] gnu: Add mcabber.
  2017-01-18 12:34 ` [PATCH 2/2] gnu: Add mcabber contact.ng0
@ 2017-01-18 19:28   ` Marius Bakke
  0 siblings, 0 replies; 10+ messages in thread
From: Marius Bakke @ 2017-01-18 19:28 UTC (permalink / raw)
  To: contact.ng0, guix-devel; +Cc: ng0

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add loudmouth.
  2017-01-18 19:16       ` Mark H Weaver
@ 2017-01-18 20:37         ` ng0
  0 siblings, 0 replies; 10+ messages in thread
From: ng0 @ 2017-01-18 20:37 UTC (permalink / raw)
  To: guix-devel

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

> ng0 <contact.ng0@cryptolab.net> writes:
>
>> Mark H Weaver <mhw@netris.org> writes:
>>
>>> ng0 <ng0@libertad.pw> writes:
>>>
>>>> * 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)))
>>>
>>> According to Debian, the license is lgpl2.0+.  Can you check this again?
>>>
>>>       Mark
>>>
>>
>> Sorry for all the mistakes, I wasn't very present when I wrote
>> this.
>> But, the license is correct. I haven't looked at debian because I
>> have the source, and it is 2.1 here.
>
> I just looked, and the source files say this:
>
>   This program is free software; you can redistribute it and/or
>   modify it under the terms of the GNU Lesser General Public License as
>   published by the Free Software Foundation; either version 2 of the
>   License, or (at your option) any later version.
>
> That means lgpl2.0+, as the Debian maintainer concluded.
>
> Have you been concluding the licenses based solely on the COPYING file
> (or similar) present in the tarball?  If so, you may have been getting
> it wrong for a long time.  The copyright notices in the source files are
> the relevant thing to check.  I usually check Debian's copyright files,
> since they've already done the hard work.
>
>      Thanks,
>        Mark

First I look for a note in README, then I will look at
COPYING/LICENSE, then I will grep for "or later", "license", and
similar words and certain similar manual steps.

Confusing source. Okay, thanks.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-01-18 20:36 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-18 12:34 mcabber, corrections contact.ng0
2017-01-18 12:34 ` [PATCH 1/2] gnu: Add loudmouth contact.ng0
2017-01-18 19:26   ` Marius Bakke
2017-01-18 12:34 ` [PATCH 2/2] gnu: Add mcabber contact.ng0
2017-01-18 19:28   ` Marius Bakke
  -- strict thread matches above, loose matches on Subject: below --
2017-01-16 20:45 Add: mcabber xmpp client ng0
2017-01-16 20:45 ` [PATCH 1/2] gnu: Add loudmouth ng0
2017-01-17  9:56   ` Mark H Weaver
2017-01-18 12:20     ` ng0
2017-01-18 19:16       ` Mark H Weaver
2017-01-18 20:37         ` ng0

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).