* [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.
2021-02-22 0:59 [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4 jgart via Guix-patches via
@ 2021-02-22 16:18 ` Leo Prikler
2021-02-22 19:09 ` jgart via Guix-patches via
2021-03-06 16:22 ` [bug#46699] [PATCH 1/2] " jgart via Guix-patches via
2 siblings, 0 replies; 9+ messages in thread
From: Leo Prikler @ 2021-02-22 16:18 UTC (permalink / raw)
To: jgart, 46699; +Cc: rg, LibreMiami
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
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.
2021-02-22 0:59 [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4 jgart via Guix-patches via
2021-02-22 16:18 ` Leo Prikler
@ 2021-02-22 19:09 ` jgart via Guix-patches via
2021-02-22 19:28 ` Leo Prikler
2021-03-06 16:22 ` [bug#46699] [PATCH 1/2] " jgart via Guix-patches via
2 siblings, 1 reply; 9+ messages in thread
From: jgart via Guix-patches via @ 2021-02-22 19:09 UTC (permalink / raw)
To: Leo Prikler, 46699; +Cc: rg, packaging-guix
[-- 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 --]
From 70ba67f64ea66fc50ac5dd7f4266ac4c814efbf1 Mon Sep 17 00:00:00 2001
From: LibreMiami <packaging-guix@libremiami.org>
Date: Sun, 21 Feb 2021 23:10:00 +0000
Subject: [PATCH] gnu: mumble: Update to 1.3.4.
* gnu/packages/telephony.scm (mumble) [version]: Update to 1.3.4.
[snippet]: Change logic from list of directories to delete to list of
directories to keep.
[native-inputs]: Add perl and ruby. Change python to python-wrapper.
Co-authored-by: jgart <jgart@dismail.de>
Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
---
gnu/packages/telephony.scm | 100 ++++++++++++++++++++-----------------
1 file changed, 53 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index df6df83dd2..60d74cbae4 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -73,6 +74,7 @@
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
#:use-module (gnu packages speech)
#:use-module (gnu packages tls)
@@ -515,37 +517,39 @@ address of one of the participants.")
(define-public mumble
(package
(name "mumble")
- (version "1.3.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://mumble.info/snapshot/stable/"
- name "-" version ".tar.gz"))
- (sha256
- (base32
- "101gw1334zmqsbjrba5dq1v4p2nxcs37g2yrzvkcra6s9ri4fw3j"))
- (modules '((guix build utils)))
- (snippet
- `(begin
- ;; Remove bundled software. Keep arc4random, celt-0.7.0,
- ;; celt-0.11.0, qqbonjour, rnnoise, smallft.
- (for-each
- delete-file-recursively
- '("3rdparty/GL" ; in mesa
- "3rdparty/mach-override-build" ; for macx
- "3rdparty/mach-override-src"
- "3rdparty/minhook-build" ; for win32
- "3rdparty/minhook-src"
- "3rdparty/opus-build" ; in opus
- "3rdparty/opus-src"
- "3rdparty/speex-build" ; in speex
- "3rdparty/speex-src"
- "3rdparty/speexdsp-src" ; in speexdsp
- "3rdparty/xinputcheck-build" ; for win32
- "3rdparty/xinputcheck-src"))
- #t))))
+ (version "1.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mumble-voip/mumble/releases/download/"
+ version "/mumble-" version ".tar.gz"))
+ (sha256
+ (base32
+ "14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1"))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-1)))
+ (snippet
+ `(begin
+ (let ((keep
+ '("arc4random-src"
+ "celt-0.7.0-build"
+ "celt-0.7.0-src"
+ "celt-0.11.0-build"
+ "celt-0.11.0-src"
+ "qqbonjour-src"
+ "rnnoise-build"
+ "rnnoise-src"
+ "smallft-src")))
+ (with-directory-excursion "3rdparty"
+ (for-each delete-file-recursively
+ (lset-difference string=?
+ (scandir ".")
+ (cons* "." ".." keep))))
+ #t)))))
(build-system qt-build-system)
(arguments
- `(#:tests? #f ; no "check" target
+ `(#:tests? #f ; no "check" target
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -563,8 +567,8 @@ address of one of the participants.")
"no-bundled-opus" ; in opus
"no-g15" ; not packaged
"no-jackaudio" ; use pulse
- "no-oss" ; use pulse
- "no-alsa" ; use pulse
+ "no-oss" ; use pulse
+ "no-alsa" ; use pulse
"no-update"
"no-embed-qt-translations"
"no-ice" ; not packaged
@@ -587,20 +591,20 @@ address of one of the participants.")
#t))
(add-before 'configure 'fix-mumble-overlay
(lambda* (#:key outputs #:allow-other-keys)
- (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))
(add-before 'install 'disable-murmur-ice
(lambda _
(substitute* "scripts/murmur.ini.system"
(("^ice=") ";ice="))
#t))
- (replace 'install ; install phase does not exist
+ (replace 'install ; install phase does not exist
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(etc (string-append out "/etc/murmur"))
@@ -634,20 +638,22 @@ address of one of the participants.")
("boost" ,boost)
("libsndfile" ,libsndfile)
("libxi" ,libxi)
- ("mesa" ,mesa) ; avoid bundled
+ ("mesa" ,mesa) ; avoid bundled
("openssl" ,openssl)
- ("opus" ,opus) ; avoid bundled
+ ("opus" ,opus) ; avoid bundled
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("speech-dispatcher" ,speech-dispatcher)
- ("speex" ,speex) ; avoid bundled
- ("speexdsp" ,speexdsp))) ; avoid bundled
+ ("speex" ,speex) ; avoid bundled
+ ("speexdsp" ,speexdsp))) ; avoid bundled
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("python" ,python)
- ("qttools" ,qttools)))
+ `(("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qttools" ,qttools)
+ ("ruby" ,ruby)))
(synopsis "Low-latency, high quality voice chat software")
(description
"Mumble is an low-latency, high quality voice chat
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4.
2021-02-22 19:09 ` jgart via Guix-patches via
@ 2021-02-22 19:28 ` Leo Prikler
0 siblings, 0 replies; 9+ messages in thread
From: Leo Prikler @ 2021-02-22 19:28 UTC (permalink / raw)
To: jgart, 46699; +Cc: rg, LibreMiami
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#46699] [PATCH 1/2] gnu: mumble: Update to 1.3.4.
2021-02-22 0:59 [bug#46699] [PATCH] gnu: mumble: Update to 1.3.4 jgart via Guix-patches via
2021-02-22 16:18 ` Leo Prikler
2021-02-22 19:09 ` jgart via Guix-patches via
@ 2021-03-06 16:22 ` jgart via Guix-patches via
2021-03-06 16:35 ` Leo Prikler
2 siblings, 1 reply; 9+ messages in thread
From: jgart via Guix-patches via @ 2021-03-06 16:22 UTC (permalink / raw)
To: Leo Prikler, 46699; +Cc: rg, LibreMiami
[-- Attachment #1: Type: text/plain, Size: 3020 bytes --]
Hi Leo,
These two patches change the logic in the snippet block from list of directories to delete to list of directories to keep as well as add indentation to the mumble package. This is an addition to commit ea13b3a14cb079e33b59cf60cdabf500ecc51cf1.
best regards,
jgart
February 22, 2021 2:09 PM, "jgart" <jgart@dismail.de> wrote:
> 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-Indent-package-definition.patch --]
[-- Type: application/octet-stream, Size: 13705 bytes --]
From 642a2abf05dd0cbd7788e30d1d0c505af94ef043 Mon Sep 17 00:00:00 2001
From: LibreMiami <packaging-guix@libremiami.org>
Date: Sat, 6 Mar 2021 01:04:32 +0000
Subject: [PATCH 1/5] gnu: mumble: Indent package definition.
* gnu/packages/telephony.scm (mumble): Indent package definition.
---
gnu/packages/telephony.scm | 203 +++++++++++++++++++------------------
1 file changed, 102 insertions(+), 101 deletions(-)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 53cc127e48..e5dee3457d 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -531,121 +532,121 @@ address of one of the participants.")
;; Remove bundled software. Keep arc4random, celt-0.7.0,
;; celt-0.11.0, qqbonjour, rnnoise, smallft.
(for-each
- delete-file-recursively
- '("3rdparty/GL" ; in mesa
- "3rdparty/mach-override-build" ; for macx
- "3rdparty/mach-override-src"
- "3rdparty/minhook-build" ; for win32
- "3rdparty/minhook-src"
- "3rdparty/opus-build" ; in opus
- "3rdparty/opus-src"
- "3rdparty/speex-build" ; in speex
- "3rdparty/speex-src"
- "3rdparty/speexdsp-src" ; in speexdsp
- "3rdparty/xinputcheck-build" ; for win32
- "3rdparty/xinputcheck-src"))
+ delete-file-recursively
+ '("3rdparty/GL" ; in mesa
+ "3rdparty/mach-override-build" ; for macx
+ "3rdparty/mach-override-src"
+ "3rdparty/minhook-build" ; for win32
+ "3rdparty/minhook-src"
+ "3rdparty/opus-build" ; in opus
+ "3rdparty/opus-src"
+ "3rdparty/speex-build" ; in speex
+ "3rdparty/speex-src"
+ "3rdparty/speexdsp-src" ; in speexdsp
+ "3rdparty/xinputcheck-build" ; for win32
+ "3rdparty/xinputcheck-src"))
#t))))
(build-system qt-build-system)
(arguments
- `(#:tests? #f ; no "check" target
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease"
- (string-append "MUMBLE_PYTHON="
- (string-append (assoc-ref inputs "python")
- "/bin/python3"))
- (string-append "CONFIG+="
- (string-join
- ;; Options used are listed in the same order
- ;; as in the "INSTALL" file
- ;; (plus the final "packaged" and "release").
- (list "no-bundled-speex" ; in speex
- "no-bundled-opus" ; in opus
- "no-g15" ; not packaged
- "no-jackaudio" ; use pulse
- "no-oss" ; use pulse
- "no-alsa" ; use pulse
- "no-update"
- "no-embed-qt-translations"
- "no-ice" ; not packaged
- "packaged"
- "release")))
- (string-append "DEFINES+="
- "PLUGIN_PATH="
- (assoc-ref outputs "out")
- "/lib/mumble"))))
- (add-before 'configure 'fix-libspeechd-include
- (lambda _
- (substitute* "src/mumble/TextToSpeech_unix.cpp"
- (("libspeechd.h") "speech-dispatcher/libspeechd.h"))
- #t))
- ;; disable statistic gathering by default. see <https://bugs.gnu.org/25201>
- (add-before 'configure 'fix-statistic-gathering-default
- (lambda _
- (substitute* "src/mumble/Settings.cpp"
- (("bUsage = true;") "bUsage = false;"))
- #t))
- (add-before 'configure 'fix-mumble-overlay
- (lambda* (#:key outputs #:allow-other-keys)
- (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))
- (add-before 'install 'disable-murmur-ice
- (lambda _
- (substitute* "scripts/murmur.ini.system"
- (("^ice=") ";ice="))
- #t))
- (replace 'install ; install phase does not exist
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (etc (string-append out "/etc/murmur"))
- (dbus (string-append out "/etc/dbus-1/system.d/"))
- (bin (string-append out "/bin"))
- (services (string-append out "/share/services"))
- (applications (string-append out "/share/applications"))
- (icons (string-append out "/share/icons/hicolor/scalable/apps"))
- (man (string-append out "/share/man/man1"))
- (lib (string-append out "/lib/mumble")))
- (install-file "release/mumble" bin)
- (install-file "scripts/mumble-overlay" bin)
- (install-file "scripts/mumble.protocol" services)
- (install-file "scripts/mumble.desktop" applications)
- (install-file "icons/mumble.svg" icons)
- (install-file "man/mumble-overlay.1" man)
- (install-file "man/mumble.1" man)
- (install-file "release/murmurd" bin)
- (install-file "scripts/murmur.ini.system" etc)
- (rename-file (string-append etc "/murmur.ini.system")
- (string-append etc "/murmur.ini"))
- (install-file "scripts/murmur.conf" dbus)
- (install-file "man/murmurd.1" man)
- (for-each (lambda (file) (install-file file lib))
- (find-files "." "\\.so\\."))
- (for-each (lambda (file) (install-file file lib))
- (find-files "release/plugins" "\\.so$"))
- #t))))))
+ `(#:tests? #f ; no "check" target
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease"
+ (string-append "MUMBLE_PYTHON="
+ (string-append (assoc-ref inputs "python")
+ "/bin/python3"))
+ (string-append "CONFIG+="
+ (string-join
+ ;; Options used are listed in the same order
+ ;; as in the "INSTALL" file
+ ;; (plus the final "packaged" and "release").
+ (list "no-bundled-speex" ; in speex
+ "no-bundled-opus" ; in opus
+ "no-g15" ; not packaged
+ "no-jackaudio" ; use pulse
+ "no-oss" ; use pulse
+ "no-alsa" ; use pulse
+ "no-update"
+ "no-embed-qt-translations"
+ "no-ice" ; not packaged
+ "packaged"
+ "release")))
+ (string-append "DEFINES+="
+ "PLUGIN_PATH="
+ (assoc-ref outputs "out")
+ "/lib/mumble"))))
+ (add-before 'configure 'fix-libspeechd-include
+ (lambda _
+ (substitute* "src/mumble/TextToSpeech_unix.cpp"
+ (("libspeechd.h") "speech-dispatcher/libspeechd.h"))
+ #t))
+ ;; disable statistic gathering by default. see <https://bugs.gnu.org/25201>
+ (add-before 'configure 'fix-statistic-gathering-default
+ (lambda _
+ (substitute* "src/mumble/Settings.cpp"
+ (("bUsage = true;") "bUsage = false;"))
+ #t))
+ (add-before 'configure 'fix-mumble-overlay
+ (lambda* (#:key outputs #:allow-other-keys)
+ (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))
+ (add-before 'install 'disable-murmur-ice
+ (lambda _
+ (substitute* "scripts/murmur.ini.system"
+ (("^ice=") ";ice="))
+ #t))
+ (replace 'install ; install phase does not exist
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (etc (string-append out "/etc/murmur"))
+ (dbus (string-append out "/etc/dbus-1/system.d/"))
+ (bin (string-append out "/bin"))
+ (services (string-append out "/share/services"))
+ (applications (string-append out "/share/applications"))
+ (icons (string-append out "/share/icons/hicolor/scalable/apps"))
+ (man (string-append out "/share/man/man1"))
+ (lib (string-append out "/lib/mumble")))
+ (install-file "release/mumble" bin)
+ (install-file "scripts/mumble-overlay" bin)
+ (install-file "scripts/mumble.protocol" services)
+ (install-file "scripts/mumble.desktop" applications)
+ (install-file "icons/mumble.svg" icons)
+ (install-file "man/mumble-overlay.1" man)
+ (install-file "man/mumble.1" man)
+ (install-file "release/murmurd" bin)
+ (install-file "scripts/murmur.ini.system" etc)
+ (rename-file (string-append etc "/murmur.ini.system")
+ (string-append etc "/murmur.ini"))
+ (install-file "scripts/murmur.conf" dbus)
+ (install-file "man/murmurd.1" man)
+ (for-each (lambda (file) (install-file file lib))
+ (find-files "." "\\.so\\."))
+ (for-each (lambda (file) (install-file file lib))
+ (find-files "release/plugins" "\\.so$"))
+ #t))))))
(inputs
`(("avahi" ,avahi)
("boost" ,boost)
("libsndfile" ,libsndfile)
("libxi" ,libxi)
- ("mesa" ,mesa) ; avoid bundled
+ ("mesa" ,mesa) ; avoid bundled
("openssl" ,openssl)
- ("opus" ,opus) ; avoid bundled
+ ("opus" ,opus) ; avoid bundled
("protobuf" ,protobuf)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("speech-dispatcher" ,speech-dispatcher)
- ("speex" ,speex) ; avoid bundled
- ("speexdsp" ,speexdsp))) ; avoid bundled
+ ("speex" ,speex) ; avoid bundled
+ ("speexdsp" ,speexdsp))) ; avoid bundled
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)
--
2.20.1
[-- Attachment #3: 0002-gnu-mumble-Modify-snippet.patch --]
[-- Type: application/octet-stream, Size: 2906 bytes --]
From 0c5d1cca9e29b1dc403a3eceb43b2eb2a461a942 Mon Sep 17 00:00:00 2001
From: LibreMiami <packaging-guix@libremiami.org>
Date: Sat, 6 Mar 2021 01:16:32 +0000
Subject: [PATCH 2/5] gnu: mumble: Modify snippet.
* gnu/packages/telephony.scm (mumble) [snippet]: Change logic from
list of directories to delete to list of directories to keep.
Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
Co-authored-by: jgart <jgart@dismail.de>
---
gnu/packages/telephony.scm | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index e5dee3457d..32020a565d 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -526,26 +526,27 @@ address of one of the participants.")
(sha256
(base32
"14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1"))
- (modules '((guix build utils)))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-1)))
(snippet
`(begin
- ;; Remove bundled software. Keep arc4random, celt-0.7.0,
- ;; celt-0.11.0, qqbonjour, rnnoise, smallft.
- (for-each
- delete-file-recursively
- '("3rdparty/GL" ; in mesa
- "3rdparty/mach-override-build" ; for macx
- "3rdparty/mach-override-src"
- "3rdparty/minhook-build" ; for win32
- "3rdparty/minhook-src"
- "3rdparty/opus-build" ; in opus
- "3rdparty/opus-src"
- "3rdparty/speex-build" ; in speex
- "3rdparty/speex-src"
- "3rdparty/speexdsp-src" ; in speexdsp
- "3rdparty/xinputcheck-build" ; for win32
- "3rdparty/xinputcheck-src"))
- #t))))
+ (let ((keep
+ '("arc4random-src"
+ "celt-0.7.0-build"
+ "celt-0.7.0-src"
+ "celt-0.11.0-build"
+ "celt-0.11.0-src"
+ "qqbonjour-src"
+ "rnnoise-build"
+ "rnnoise-src"
+ "smallft-src")))
+ (with-directory-excursion "3rdparty"
+ (for-each delete-file-recursively
+ (lset-difference string=?
+ (scandir ".")
+ (cons* "." ".." keep))))
+ #t)))))
(build-system qt-build-system)
(arguments
`(#:tests? #f ; no "check" target
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#46699] [PATCH 1/2] gnu: mumble: Update to 1.3.4.
2021-03-06 16:22 ` [bug#46699] [PATCH 1/2] " jgart via Guix-patches via
@ 2021-03-06 16:35 ` Leo Prikler
2021-03-06 17:38 ` Leo Prikler
2021-03-07 4:22 ` jgart via Guix-patches via
0 siblings, 2 replies; 9+ messages in thread
From: Leo Prikler @ 2021-03-06 16:35 UTC (permalink / raw)
To: jgart, 46699; +Cc: rg, LibreMiami
Am Samstag, den 06.03.2021, 16:22 +0000 schrieb jgart:
> Hi Leo,
>
> These two patches change the logic in the snippet block from list of
> directories to delete to list of directories to keep as well as add
> indentation to the mumble package. This is an addition to commit
> ea13b3a14cb079e33b59cf60cdabf500ecc51cf1.
>
> best regards,
>
> jgart
Hi jgart,
0001 suffers from similar issues as your previous patch set. In
particular, it adds a spurious level of indentation in arguments!
0002 LGTM, I'll push it after some testing. On that note, could
someone investigate why we keep ancient versions of CELT around? It
seems newer ones have been merged into opus.
Regards,
Leo
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#46699] [PATCH 1/2] gnu: mumble: Update to 1.3.4.
2021-03-06 16:35 ` Leo Prikler
@ 2021-03-06 17:38 ` Leo Prikler
2021-03-07 4:22 ` jgart via Guix-patches via
1 sibling, 0 replies; 9+ messages in thread
From: Leo Prikler @ 2021-03-06 17:38 UTC (permalink / raw)
To: jgart, 46699; +Cc: rg, LibreMiami
Am Samstag, den 06.03.2021, 17:35 +0100 schrieb Leo Prikler:
> Am Samstag, den 06.03.2021, 16:22 +0000 schrieb jgart:
> > Hi Leo,
> >
> > These two patches change the logic in the snippet block from list
> > of
> > directories to delete to list of directories to keep as well as add
> > indentation to the mumble package. This is an addition to commit
> > ea13b3a14cb079e33b59cf60cdabf500ecc51cf1.
> >
> > best regards,
> >
> > jgart
> Hi jgart,
>
> 0001 suffers from similar issues as your previous patch set. In
> particular, it adds a spurious level of indentation in arguments!
> 0002 LGTM, I'll push it after some testing. On that note, could
> someone investigate why we keep ancient versions of CELT around? It
> seems newer ones have been merged into opus.
>
> Regards,
> Leo
I've now pushed 0002. As far as keeping ancient CELT, it seems version
1.4.0 will at least drop 0.11, while keeping 0.7 for backwards
compatibility.
Do you want to keep this bug open for more indentation adjustments or
is it fine to close?
Regards,
Leo
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#46699] [PATCH 1/2] gnu: mumble: Update to 1.3.4.
2021-03-06 16:35 ` Leo Prikler
2021-03-06 17:38 ` Leo Prikler
@ 2021-03-07 4:22 ` jgart via Guix-patches via
2021-03-07 8:09 ` bug#46699: " Leo Prikler
1 sibling, 1 reply; 9+ messages in thread
From: jgart via Guix-patches via @ 2021-03-07 4:22 UTC (permalink / raw)
To: Leo Prikler, 46699; +Cc: rg, LibreMiami
Hi Leo,
It is fine to close this bug.
Thank you for taking the time to review these changes and for merging the other patch.
We'll keep CELT in mind going forward. Thank you for pointing that out.
all the best,
jgart
libremiami.org
March 6, 2021 12:38 PM, "Leo Prikler" <leo.prikler@student.tugraz.at> wrote:
> Am Samstag, den 06.03.2021, 17:35 +0100 schrieb Leo Prikler:
>
>> Am Samstag, den 06.03.2021, 16:22 +0000 schrieb jgart:
>> Hi Leo,
>>
>> These two patches change the logic in the snippet block from list
>> of
>> directories to delete to list of directories to keep as well as add
>> indentation to the mumble package. This is an addition to commit
>> ea13b3a14cb079e33b59cf60cdabf500ecc51cf1.
>>
>> best regards,
>>
>> jgart
>> Hi jgart,
>>
>> 0001 suffers from similar issues as your previous patch set. In
>> particular, it adds a spurious level of indentation in arguments!
>> 0002 LGTM, I'll push it after some testing. On that note, could
>> someone investigate why we keep ancient versions of CELT around? It
>> seems newer ones have been merged into opus.
>>
>> Regards,
>> Leo
>
> I've now pushed 0002. As far as keeping ancient CELT, it seems version
> 1.4.0 will at least drop 0.11, while keeping 0.7 for backwards
> compatibility.
>
> Do you want to keep this bug open for more indentation adjustments or
> is it fine to close?
>
> Regards,
> Leo
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#46699: [PATCH 1/2] gnu: mumble: Update to 1.3.4.
2021-03-07 4:22 ` jgart via Guix-patches via
@ 2021-03-07 8:09 ` Leo Prikler
0 siblings, 0 replies; 9+ messages in thread
From: Leo Prikler @ 2021-03-07 8:09 UTC (permalink / raw)
To: jgart, 46699-done; +Cc: rg, LibreMiami
Hi jgart,
Am Sonntag, den 07.03.2021, 04:22 +0000 schrieb jgart:
> Hi Leo,
>
> It is fine to close this bug.
Very well, doing so.
> Thank you for taking the time to review these changes and for merging
> the other patch.
>
> We'll keep CELT in mind going forward. Thank you for pointing that
> out.
Thank you for submitting the patches.
Regards,
Leo
^ permalink raw reply [flat|nested] 9+ messages in thread