mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnome-music: Fix crash when GOA is not available.

Browse source 
* gnu/packages/gnome.scm (gnome-music) [patches]: Add gnome-music-fix-crash.patch
* gnu/packages/patches/gnome-music-fix-crash.patch: New file
* gnu/local.mk (gnome-music-fix-crash.patch): New reference.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Raghav Gururajan 2020-09-01 23:20:45 -04:00 committed by Danny Milosavljevic
parent 69e7da457d
commit 769f4ea088
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
3 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1057,6 +1057,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-supported-locales.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnome-music-fix-crash.patch \
%D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \

6
gnu/packages/gnome.scm
View file

@ -842,12 +842,14 @@ (define-public gnome-music
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh"))))
(base32 "0zdpjgwf48bqb66wrl6k33pzcmc2g3m1046ma7z8xaj9idpi37jh"))
(patches
(search-patches "gnome-music-fix-crash.patch"))))
(build-system meson-build-system)
(outputs '("out" "help"))
(arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:python? #t ; To wrap binaries
#:python? #t ; To wrap binaries
#:tests? #f ; Tests require networking
#:phases
(modify-phases %standard-phases

36
gnu/packages/patches/gnome-music-fix-crash.patch Normal file
View file

@ -0,0 +1,36 @@
From 8e12c01e99fcc1bf706097ee64b2719fb2d87202 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 30 Aug 2020 15:17:33 +0100
Subject: [PATCH] scrobbler: Don't crash if gnome-online-accounts is
unavailable
goa_client_get_manager() can return NULL (in Python,
GoaClient.get_manager() can return None) if the gnome-online-accounts
D-Bus service is not available.
Resolves: gnome-music#410
Bug-Debian: https://bugs.debian.org/969271
Signed-off-by: Simon McVittie <smcv@debian.org>
---
gnomemusic/scrobbler.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gnomemusic/scrobbler.py b/gnomemusic/scrobbler.py
index 04888594..d133f2fa 100644
--- a/gnomemusic/scrobbler.py
+++ b/gnomemusic/scrobbler.py
@@ -76,6 +76,11 @@ class GoaLastFM(GObject.GObject):
return
manager = self._client.get_manager()
+
+ if manager is None:
+ self._log.info("GNOME Online Accounts is unavailable")
+ return
+
try:
manager.call_is_supported_provider(
"lastfm", None, self._lastfm_is_supported_cb)
--
GitLab