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

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

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

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.