The first time you run the mumble client there is a setup wizard. One of the screens asks if you'd like to send some sort of usage data to the Mumble developers. The checkbox is checked by default. I think it should be unchecked by default. - Dave
"Thompson, David" <dthompson2@worcester.edu> writes: > The first time you run the mumble client there is a setup wizard. One > of the screens asks if you'd like to send some sort of usage data to > the Mumble developers. The checkbox is checked by default. I think > it should be unchecked by default. > > - Dave Upstream source in addition to SF: https://github.com/mumble-voip/mumble This commit has introduced the statistics button: commit 36c9d56d7959fbf5bc83ea746a143b57614f9a4d Author: Thorvald Natvig <slicer@users.sourceforge.net> Date: Fri Jan 9 20:29:44 2009 +0000 Mute loopback in wizard during welcome and finish pages. Add question about statistics to the end of the audio wizard. git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1402 05730e5d-ab1b-0410-a4ac-84af 385074fa Chances are it moved elsewhere in those 7 years, but maybe someone can work with this information. -- ♥Ⓐ ng0 PGP keys and more: https://n0is.noblogs.org/ http://ng0.chaosnet.org
Fixes <https://bugs.gnu.org/25201> --- gnu/packages/patches/mumble-statistic-25201.patch | 13 +++++++++++++ gnu/packages/telephony.scm | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 gnu/packages/patches/mumble-statistic-25201.patch diff --git a/gnu/packages/patches/mumble-statistic-25201.patch b/gnu/packages/patches/mumble-statistic-25201.patch new file mode 100644 index 0000000000..3cce1826a7 --- /dev/null +++ b/gnu/packages/patches/mumble-statistic-25201.patch @@ -0,0 +1,13 @@ +changed usage statistic gathering defaults to off. See <https://bugs.gnu.org/25201> + +--- a/src/mumble/Settings.cpp 2020-03-08 15:29:11.897056953 +0100 ++++ b/src/mumble/Settings.cpp 2020-03-08 14:11:53.600486793 +0100 +@@ -298,7 +298,7 @@ + bHideInTray = !isUnityDesktop && QSystemTrayIcon::isSystemTrayAvailable(); + #endif + bStateInTray = true; +- bUsage = true; ++ bUsage = false; + bShowUserCount = false; + bChatBarUseSelection = false; + bFilterHidesEmptyChannels = true; diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index a645c58562..74991079db 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> +;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -404,6 +405,7 @@ address of one of the participants.") (base32 "03dqg5yf6d7ilc1wydpshnv1ndssppcbadqcq20jm5j4fdaf53cs")) (modules '((guix build utils))) + (patches (search-patches "mumble-statistic-25201.patch")) (snippet `(begin ;; Remove bundled software. Keep arc4random, celt-0.7.0, -- 2.25.1
[-- Attachment #1: Type: text/plain, Size: 2696 bytes --] When you add a patch you also need to register it in gnu/local.mk so when we create tarballs it makes sure that all the files are included. On the other hand, since it's really only a 1 line change it would probably be better to do it in the snippet. Can you send a revised patch? (Or let me know why it should be a patch file :) ) On Sun, Mar 08, 2020 at 06:03:16PM +0100, mike@rohleder.de wrote: > Fixes <https://bugs.gnu.org/25201> > --- > gnu/packages/patches/mumble-statistic-25201.patch | 13 +++++++++++++ > gnu/packages/telephony.scm | 2 ++ > 2 files changed, 15 insertions(+) > create mode 100644 gnu/packages/patches/mumble-statistic-25201.patch > > diff --git a/gnu/packages/patches/mumble-statistic-25201.patch b/gnu/packages/patches/mumble-statistic-25201.patch > new file mode 100644 > index 0000000000..3cce1826a7 > --- /dev/null > +++ b/gnu/packages/patches/mumble-statistic-25201.patch > @@ -0,0 +1,13 @@ > +changed usage statistic gathering defaults to off. See <https://bugs.gnu.org/25201> > + > +--- a/src/mumble/Settings.cpp 2020-03-08 15:29:11.897056953 +0100 > ++++ b/src/mumble/Settings.cpp 2020-03-08 14:11:53.600486793 +0100 > +@@ -298,7 +298,7 @@ > + bHideInTray = !isUnityDesktop && QSystemTrayIcon::isSystemTrayAvailable(); > + #endif > + bStateInTray = true; > +- bUsage = true; > ++ bUsage = false; > + bShowUserCount = false; > + bChatBarUseSelection = false; > + bFilterHidesEmptyChannels = true; > diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm > index a645c58562..74991079db 100644 > --- a/gnu/packages/telephony.scm > +++ b/gnu/packages/telephony.scm > @@ -15,6 +15,7 @@ > ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> > ;;; Copyright © 2019 Ivan Vilata i Balaguer <ivan@selidor.net> > ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> > +;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -404,6 +405,7 @@ address of one of the participants.") > (base32 > "03dqg5yf6d7ilc1wydpshnv1ndssppcbadqcq20jm5j4fdaf53cs")) > (modules '((guix build utils))) > + (patches (search-patches "mumble-statistic-25201.patch")) > (snippet > `(begin > ;; Remove bundled software. Keep arc4random, celt-0.7.0, > -- > 2.25.1 > > > > -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
* disable statistic gathering by default. see <https://bugs.gnu.org/25201> --- gnu/packages/telephony.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index a645c58562..3d0384c8bc 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -462,6 +462,12 @@ address of one of the participants.") (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 'install 'disable-murmur-ice (lambda _ (substitute* "scripts/murmur.ini.system" -- 2.25.1
[-- Attachment #1: Type: text/plain, Size: 299 bytes --] I changed the commit message to fit our conventions better and pushed it. Thanks! -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
Hi, Thanks for improving Guix! Having an old bug closed is great. I'm trying to follow along, and learn some things about making Guix packages. One question I have after seeing this change is how did you decide whether to make this change in the source definition (with a patch or a snippet) or in a phase during the build? Perhaps for this change the differences don't matter to much, so I won't learn much, but I thought I'd ask anyway :) Best, Jack
[-- Attachment #1: Type: text/plain, Size: 907 bytes --] Hi Jack, Jack Hill <jackhill@jackhill.us> writes: > I'm trying to follow along, and learn some things about making Guix > packages. One question I have after seeing this change is how did you > decide whether to make this change in the source definition (with a > patch or a snippet) or in a phase during the build? Well, I saw the substitute* of a #include header (fix-libspeechd-include) in the phase, but the removing of dirs in the source definition and I thought, ok, it might make more sense this way. (because, eg, the phase names (fix-libspeechd-include, fix-statistic-gathering-default etc) could be printed in the log etc) This decition was more a "it feels better" than knowledge, because I'm new to guix and scheme and love to learn (by doing) ;) Regards mike -- I have seen the needle and the damage done and every junkie is like a setting sun. -- Neil Young [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 487 bytes --]
On Tue, 10 Mar 2020, mike@rohleder.de wrote:
> Hi Jack,
>
> Jack Hill <jackhill@jackhill.us> writes:
>> I'm trying to follow along, and learn some things about making Guix
>> packages. One question I have after seeing this change is how did you
>> decide whether to make this change in the source definition (with a
>> patch or a snippet) or in a phase during the build?
>
> Well, I saw the substitute* of a #include header
> (fix-libspeechd-include) in the phase, but the removing of dirs in the
> source definition and I thought, ok, it might make more sense this way.
> (because, eg, the phase names (fix-libspeechd-include,
> fix-statistic-gathering-default etc) could be printed in the log etc)
>
> This decition was more a "it feels better" than knowledge, because I'm
> new to guix and scheme and love to learn (by doing) ;)
Makes sense, thanks for sharing.
Jack
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --] On Tue, Mar 10, 2020 at 10:50:57AM -0400, Jack Hill wrote: > Hi, > > Thanks for improving Guix! Having an old bug closed is great. > > I'm trying to follow along, and learn some things about making Guix > packages. One question I have after seeing this change is how did you decide > whether to make this change in the source definition (with a patch or a > snippet) or in a phase during the build? > > Perhaps for this change the differences don't matter to much, so I won't > learn much, but I thought I'd ask anyway :) > > Best, > Jack In general changes in snippets are used to remove non-free software and to allow the software to build. The idea is that 'guix build -S foo' will return the source for foo which could be taken to a non-guix system and built normally. In practice I'm not sure how often this is the case. -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]