[bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.

[bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.

[jgart via Guix-patches via]

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

Hi Guix,

Raghav Gururajan and I updated mumble to 1.3.4. The patch is attached. 

Thank you,

jgart

libremiami.org
search.libremiami.org

[-- Attachment #2: 0001-gnu-mumble-Update-to-1.3.4.patch --]
[-- Type: application/octet-stream, Size: 7454 bytes --]

[bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.

[Leo Prikler]

Hi jgart and all the others listening from LibreMiami,

Am Montag, den 22.02.2021, 00:59 +0000 schrieb jgart:
> Co-author: jgart <jgart@dismail.de>
> Co-author: Raghav Gururajan <rg@raghavgururajan.name>
IIRC, the correct tag would be Co-authored-by.

> * gnu/packages/telephony.scm (mumble): Update to 1.3.4.
This is not enough of a ChangeLog for the changes made here.

> -     `(#:tests? #f  ; no "check" target
> +     `(#:tests? #f                      ; no "check" target

> -                                           "no-oss" ; use pulse
> -                                           "no-alsa" ; use pulse
> +                                           "no-oss"       ; use
> pulse
> +                                           "no-alsa"      ; use
> pulse

> -              (with-output-to-file "scripts/mumble-overlay"
> -                (lambda ()
> -                  (format #t "#!~a~%" (which "bash"))
> -                  (format #t "export LD_PRELOAD=\"~a
> $LD_PRELOAD\"~%"
> -                          (string-append (assoc-ref outputs "out")
> -                                         "/lib/mumble/libmumble.so.1
> "))
> -                  (format #t "exec \"${@}\"")))
> -              #t))
> +             (with-output-to-file "scripts/mumble-overlay"
> +               (lambda ()
> +                 (format #t "#!~a~%" (which "bash"))
> +                 (format #t "export LD_PRELOAD=\"~a $LD_PRELOAD\"~%"
> +                         (string-append (assoc-ref outputs "out")
> +                                        "/lib/mumble/libmumble.so.1"
> ))
> +                 (format #t "exec \"${@}\"")))
> +             #t))

> -         (replace 'install ; install phase does not exist
> +         (replace 'install              ; install phase does not
> exist

> -       ("mesa" ,mesa) ; avoid bundled
> +       ("mesa" ,mesa)                   ; avoid bundled
>         ("openssl" ,openssl)
> -       ("opus" ,opus) ; avoid bundled
> +       ("opus" ,opus)                   ; avoid bundled

> -       ("speex" ,speex) ; avoid bundled
> -       ("speexdsp" ,speexdsp))) ; avoid bundled
> +       ("speex" ,speex)                 ; avoid bundled
> +       ("speexdsp" ,speexdsp)))         ; avoid bundled
These lines appear to be noise, some of them definitely are. 

> -     `(("pkg-config" ,pkg-config)
> -       ("python" ,python)
> -       ("qttools" ,qttools)))
> +     `(("perl" ,perl)
> +       ("pkg-config" ,pkg-config)
> +       ("python" ,python-wrapper)
> +       ("qttools" ,qttools)
> +       ("ruby" ,ruby)))
Are perl and ruby really required?  If so, what for?

Regards,
Leo

[bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.

[jgart via Guix-patches via]

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

Hi Leo,

> IIRC, the correct tag would be Co-authored-by.

I attached the updated patch with your suggestions.

> These lines appear to be noise, some of them definitely are.

Raghav thinks these might have been introduced by indent.el

How would you suggest to remove them?

> Are perl and ruby really required? If so, what for?

They are for the 'patch-shebangs phase.

Thank you for taking the time to review these patches,

jgart

libremiami.org
search.libremiami.org




February 22, 2021 11:18 AM, "Leo Prikler" <leo.prikler@student.tugraz.at> wrote:

> Hi jgart and all the others listening from LibreMiami,
> 
> Am Montag, den 22.02.2021, 00:59 +0000 schrieb jgart:
> 
>> Co-author: jgart <jgart@dismail.de>
>> Co-author: Raghav Gururajan <rg@raghavgururajan.name>
> 
> 
>> * gnu/packages/telephony.scm (mumble): Update to 1.3.4.
> 
> This is not enough of a ChangeLog for the changes made here.
> 
>> - `(#:tests? #f ; no "check" target
>> + `(#:tests? #f ; no "check" target
>> 
>> - "no-oss" ; use pulse
>> - "no-alsa" ; use pulse
>> + "no-oss" ; use
>> pulse
>> + "no-alsa" ; use
>> pulse
>> 
>> - (with-output-to-file "scripts/mumble-overlay"
>> - (lambda ()
>> - (format #t "#!~a~%" (which "bash"))
>> - (format #t "export LD_PRELOAD=\"~a
>> $LD_PRELOAD\"~%"
>> - (string-append (assoc-ref outputs "out")
>> - "/lib/mumble/libmumble.so.1
>> "))
>> - (format #t "exec \"${@}\"")))
>> - #t))
>> + (with-output-to-file "scripts/mumble-overlay"
>> + (lambda ()
>> + (format #t "#!~a~%" (which "bash"))
>> + (format #t "export LD_PRELOAD=\"~a $LD_PRELOAD\"~%"
>> + (string-append (assoc-ref outputs "out")
>> + "/lib/mumble/libmumble.so.1"
>> ))
>> + (format #t "exec \"${@}\"")))
>> + #t))
>> 
>> - (replace 'install ; install phase does not exist
>> + (replace 'install ; install phase does not
>> exist
>> 
>> - ("mesa" ,mesa) ; avoid bundled
>> + ("mesa" ,mesa) ; avoid bundled
>> ("openssl" ,openssl)
>> - ("opus" ,opus) ; avoid bundled
>> + ("opus" ,opus) ; avoid bundled
>> 
>> - ("speex" ,speex) ; avoid bundled
>> - ("speexdsp" ,speexdsp))) ; avoid bundled
>> + ("speex" ,speex) ; avoid bundled
>> + ("speexdsp" ,speexdsp))) ; avoid bundled
> 
> These lines appear to be noise, some of them definitely are.
> 
>> - `(("pkg-config" ,pkg-config)
>> - ("python" ,python)
>> - ("qttools" ,qttools)))
>> + `(("perl" ,perl)
>> + ("pkg-config" ,pkg-config)
>> + ("python" ,python-wrapper)
>> + ("qttools" ,qttools)
>> + ("ruby" ,ruby)))
> 
> 
> Regards,
> Leo

[-- Attachment #2: 0001-gnu-mumble-Update-to-1.3.4.patch --]
[-- Type: application/octet-stream, Size: 7634 bytes --]

[bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.

[Leo Prikler]

Hi jgart,

Am Montag, den 22.02.2021, 19:09 +0000 schrieb jgart:
> Hi Leo,
> 
> > IIRC, the correct tag would be Co-authored-by.
> 
> I attached the updated patch with your suggestions.
> 
> > These lines appear to be noise, some of them definitely are.
> 
> Raghav thinks these might have been introduced by indent.el
> 
> How would you suggest to remove them?
You can select the lines you actually wish to commit through `git
commit -p` or use any other tool to do the trick (e.g. Magit or gitg). 
indent.el is a bit of a hammer.  If you don't actively edit code, that
has wrong indentation, it's wiser to just indent your portions with
Emacs.

> > Are perl and ruby really required? If so, what for?
> 
> They are for the 'patch-shebangs phase.
And why do you care about those shebangs?  Are any of those programs
patched by that phase run at any point during build?

Regards,
Leo