[PATCH 1/2] gnu: gajim: License is "version 3 only".

[PATCH 1/2] gnu: gajim: License is "version 3 only".

[Arun Isaac]

* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
 gnu/packages/messaging.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..37bbed7 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single window modes; support
 for group chat (with Multi-User Chat protocol), invitation, chat to group chat
 transformation; audio and video conferences; file transfer; TLS, GPG and
 end-to-end encryption support; XML console.")
-    (license license:gpl3+)))
+    (license license:gpl3)))
 
 (define-public prosody
   (package
-- 
2.10.1

[PATCH 2/2] gnu: gajim: Update to 0.16.6.

[Arun Isaac]

* gnu/packages/messaging.scm (gajim): Update to 0.16.6.
---
 gnu/packages/messaging.scm | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 37bbed7..66cf231 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -452,7 +452,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
 (define-public gajim
   (package
     (name "gajim")
-    (version "0.16.5")
+    (version "0.16.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gajim.org/downloads/"
@@ -460,34 +460,27 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
                                   "/gajim-" version ".tar.bz2"))
               (sha256
                (base32
-                "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55"))))
+                "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; The only check done by gajim-0.16.x is to check that the
-       ;; translations are up-to-date, and in 0.16.5 they are not, so
-       ;; "make check" fails.  Therefore, we disable tests for now.
-       ;;
-       ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
-       ;;
-       #:tests? #f
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-program
-          (lambda* (#:key outputs #:allow-other-keys)
-            ;; Make sure all Python scripts run with the correct PYTHONPATH.
-            (let ((out (assoc-ref outputs "out"))
-                  (path (getenv "PYTHONPATH")))
-              (for-each (lambda (name)
-                          (let ((file (string-append out "/bin/" name)))
-                            ;; Wrapping destroys identification of intended
-                            ;; application, so we need to override "APP".
-                            (substitute* file
-                              (("APP=`basename \\$0`")
-                               (string-append "APP=" name)))
-                            (wrap-program file
-                              `("PYTHONPATH" ":" prefix (,path)))))
-                        '("gajim" "gajim-remote" "gajim-history-manager")))
-            #t)))))
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Make sure all Python scripts run with the correct PYTHONPATH.
+             (let ((out (assoc-ref outputs "out"))
+                   (path (getenv "PYTHONPATH")))
+               (for-each (lambda (name)
+                           (let ((file (string-append out "/bin/" name)))
+                             ;; Wrapping destroys identification of intended
+                             ;; application, so we need to override "APP".
+                             (substitute* file
+                               (("APP=`basename \\$0`")
+                                (string-append "APP=" name)))
+                             (wrap-program file
+                               `("PYTHONPATH" ":" prefix (,path)))))
+                         '("gajim" "gajim-remote" "gajim-history-manager")))
+             #t)))))
     (native-inputs
      `(("intltool" ,intltool)))
     (propagated-inputs
-- 
2.10.1

Re: [PATCH 2/2] gnu: gajim: Update to 0.16.6.

[Leo Famulari]

On Wed, Oct 19, 2016 at 10:20:05AM +0530, Arun Isaac wrote:
> * gnu/packages/messaging.scm (gajim): Update to 0.16.6.

>      (arguments
> -     `(;; The only check done by gajim-0.16.x is to check that the
> -       ;; translations are up-to-date, and in 0.16.5 they are not, so
> -       ;; "make check" fails.  Therefore, we disable tests for now.
> -       ;;
> -       ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
> -       ;;
> -       #:tests? #f

Is that comment still true? If so, I think we can leave the tests
disabled.

>           (add-after 'install 'wrap-program
> -          (lambda* (#:key outputs #:allow-other-keys)
> -            ;; Make sure all Python scripts run with the correct PYTHONPATH.
> -            (let ((out (assoc-ref outputs "out"))
> -                  (path (getenv "PYTHONPATH")))
> -              (for-each (lambda (name)
> -                          (let ((file (string-append out "/bin/" name)))
> -                            ;; Wrapping destroys identification of intended
> -                            ;; application, so we need to override "APP".
> -                            (substitute* file
> -                              (("APP=`basename \\$0`")
> -                               (string-append "APP=" name)))
> -                            (wrap-program file
> -                              `("PYTHONPATH" ":" prefix (,path)))))
> -                        '("gajim" "gajim-remote" "gajim-history-manager")))
> -            #t)))))
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Make sure all Python scripts run with the correct PYTHONPATH.
> +             (let ((out (assoc-ref outputs "out"))
> +                   (path (getenv "PYTHONPATH")))
> +               (for-each (lambda (name)
> +                           (let ((file (string-append out "/bin/" name)))
> +                             ;; Wrapping destroys identification of intended
> +                             ;; application, so we need to override "APP".
> +                             (substitute* file
> +                               (("APP=`basename \\$0`")
> +                                (string-append "APP=" name)))
> +                             (wrap-program file
> +                               `("PYTHONPATH" ":" prefix (,path)))))
> +                         '("gajim" "gajim-remote" "gajim-history-manager")))
> +             #t)))))

This is just an indentation fix, right? Just checking :)

Re: [PATCH 2/2] gnu: gajim: Update to 0.16.6.

[Arun Isaac]

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


Leo Famulari writes:

>>      (arguments
>> -     `(;; The only check done by gajim-0.16.x is to check that the
>> -       ;; translations are up-to-date, and in 0.16.5 they are not, so
>> -       ;; "make check" fails.  Therefore, we disable tests for now.
>> -       ;;
>> -       ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
>> -       ;;
>> -       #:tests? #f
>
> Is that comment still true? If so, I think we can leave the tests
> disabled.

I was able to build gajim with the tests enabled. So, I'm assuming this
comment is no longer true.

>>           (add-after 'install 'wrap-program
>> -          (lambda* (#:key outputs #:allow-other-keys)
>> -            ;; Make sure all Python scripts run with the correct PYTHONPATH.
>> -            (let ((out (assoc-ref outputs "out"))
>> -                  (path (getenv "PYTHONPATH")))
>> -              (for-each (lambda (name)
>> -                          (let ((file (string-append out "/bin/" name)))
>> -                            ;; Wrapping destroys identification of intended
>> -                            ;; application, so we need to override "APP".
>> -                            (substitute* file
>> -                              (("APP=`basename \\$0`")
>> -                               (string-append "APP=" name)))
>> -                            (wrap-program file
>> -                              `("PYTHONPATH" ":" prefix (,path)))))
>> -                        '("gajim" "gajim-remote" "gajim-history-manager")))
>> -            #t)))))
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             ;; Make sure all Python scripts run with the correct PYTHONPATH.
>> +             (let ((out (assoc-ref outputs "out"))
>> +                   (path (getenv "PYTHONPATH")))
>> +               (for-each (lambda (name)
>> +                           (let ((file (string-append out "/bin/" name)))
>> +                             ;; Wrapping destroys identification of intended
>> +                             ;; application, so we need to override "APP".
>> +                             (substitute* file
>> +                               (("APP=`basename \\$0`")
>> +                                (string-append "APP=" name)))
>> +                             (wrap-program file
>> +                               `("PYTHONPATH" ":" prefix (,path)))))
>> +                         '("gajim" "gajim-remote" "gajim-history-manager")))
>> +             #t)))))
>
> This is just an indentation fix, right? Just checking :)

Yes, this is just an indentation fix.

I'll send an updated set of patches with the changes to the "version 3
only" fix incorporated.

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

[PATCH 1/2] gnu: gajim: License is "version 3 only".

[Arun Isaac]

* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
 gnu/packages/messaging.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..f5a8c4a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,11 @@ Among its features are: a tabbed chat window and single window modes; support
 for group chat (with Multi-User Chat protocol), invitation, chat to group chat
 transformation; audio and video conferences; file transfer; TLS, GPG and
 end-to-end encryption support; XML console.")
-    (license license:gpl3+)))
+    ;; Gajim is released under the GPL3 license, but a few files are
+    ;; released under the GPL3+ and the 2-clause BSD licenses
+    (license (list license:gpl3
+                   license:gpl3+
+                   license:bsd-2))))
 
 (define-public prosody
   (package
-- 
2.10.1

[PATCH 2/2] gnu: gajim: Update to 0.16.6.

[Arun Isaac]

* gnu/packages/messaging.scm (gajim): Update to 0.16.6.
---
 gnu/packages/messaging.scm | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f5a8c4a..4ce7310 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -452,7 +452,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
 (define-public gajim
   (package
     (name "gajim")
-    (version "0.16.5")
+    (version "0.16.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gajim.org/downloads/"
@@ -460,34 +460,27 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
                                   "/gajim-" version ".tar.bz2"))
               (sha256
                (base32
-                "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55"))))
+                "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; The only check done by gajim-0.16.x is to check that the
-       ;; translations are up-to-date, and in 0.16.5 they are not, so
-       ;; "make check" fails.  Therefore, we disable tests for now.
-       ;;
-       ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
-       ;;
-       #:tests? #f
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-program
-          (lambda* (#:key outputs #:allow-other-keys)
-            ;; Make sure all Python scripts run with the correct PYTHONPATH.
-            (let ((out (assoc-ref outputs "out"))
-                  (path (getenv "PYTHONPATH")))
-              (for-each (lambda (name)
-                          (let ((file (string-append out "/bin/" name)))
-                            ;; Wrapping destroys identification of intended
-                            ;; application, so we need to override "APP".
-                            (substitute* file
-                              (("APP=`basename \\$0`")
-                               (string-append "APP=" name)))
-                            (wrap-program file
-                              `("PYTHONPATH" ":" prefix (,path)))))
-                        '("gajim" "gajim-remote" "gajim-history-manager")))
-            #t)))))
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Make sure all Python scripts run with the correct PYTHONPATH.
+             (let ((out (assoc-ref outputs "out"))
+                   (path (getenv "PYTHONPATH")))
+               (for-each (lambda (name)
+                           (let ((file (string-append out "/bin/" name)))
+                             ;; Wrapping destroys identification of intended
+                             ;; application, so we need to override "APP".
+                             (substitute* file
+                               (("APP=`basename \\$0`")
+                                (string-append "APP=" name)))
+                             (wrap-program file
+                               `("PYTHONPATH" ":" prefix (,path)))))
+                         '("gajim" "gajim-remote" "gajim-history-manager")))
+             #t)))))
     (native-inputs
      `(("intltool" ,intltool)))
     (propagated-inputs
-- 
2.10.1

Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

[Leo Famulari]

On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.

Thanks for checking on this!

Indeed, the bulk of the license headers say "version 3 only", so I think
gajim is GPL3. But, I found a few files that are GPL3+, and at least one
2-clause BSD licensed file in 'src/command-system'.

Can you revise this patch to give a license list, with comments
explaining that the package is GPL3 but includes some
differently-licensed components?

> ---
>  gnu/packages/messaging.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 0089da1..37bbed7 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single window modes; support
>  for group chat (with Multi-User Chat protocol), invitation, chat to group chat
>  transformation; audio and video conferences; file transfer; TLS, GPG and
>  end-to-end encryption support; XML console.")
> -    (license license:gpl3+)))
> +    (license license:gpl3)))
>  
>  (define-public prosody
>    (package
> -- 
> 2.10.1
> 
> 

Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
>> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
>
> Thanks for checking on this!
>
> Indeed, the bulk of the license headers say "version 3 only", so I think
> gajim is GPL3. But, I found a few files that are GPL3+, and at least one
> 2-clause BSD licensed file in 'src/command-system'.
>
> Can you revise this patch to give a license list, with comments
> explaining that the package is GPL3 but includes some
> differently-licensed components?

Given that the combination is GPLv3-only in practice, I think it’s
enough to write ‘gpl3’ (I know we’ve been somewhat inconsistent here…).

Ludo’.

Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".

[Arun Isaac]

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


> Given that the combination is GPLv3-only in practice, I think it’s
> enough to write ‘gpl3’ (I know we’ve been somewhat inconsistent here…).

In that case, could you use the patch set I sent earlier? That has only
the GPL3.

http://lists.gnu.org/archive/html/guix-devel/2016-10/msg00974.html

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