Attachment 897765 Details for Bug 1012176 – Upstream patch.

[patch] Upstream patch.

0001-Added-fix-for-BZ-1012176.patch (text/plain), 3.32 KB, created by Eric Christensen on 2014-05-21 00:50:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Christensen

Created: 2014-05-21 00:50:30 UTC

Size: 3.32 KB

patch

obsolete

>From 82faf6dc1bb49762ed0117d507577b9127c21d63 Mon Sep 17 00:00:00 2001
>From: Eric Christensen <sparks@fedoraproject.org>
>Date: Tue, 20 May 2014 20:46:54 -0400
>Subject: [PATCH] Added fix for BZ 1012176
>
>---
> Dont-try-to-mount-null-devices.patch | 32 ++++++++++++++++++++++++++++++++
> banshee.spec                         |  7 ++++++-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 Dont-try-to-mount-null-devices.patch
>
>diff --git a/Dont-try-to-mount-null-devices.patch b/Dont-try-to-mount-null-devices.patch
>new file mode 100644
>index 0000000..2669a84
>--- /dev/null
>+++ b/Dont-try-to-mount-null-devices.patch
>@@ -0,0 +1,32 @@
>+From d79cb9f5e693015eab0c9707da96fc3eb761b209 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com>
>+Date: Wed, 19 Mar 2014 02:37:03 +0100
>+Subject: [PATCH] Gio: don't try to mount null devices (bgo#726147)
>+
>+The log in bgo#726147 can tell us that we were forgetting a null
>+check in HandleMonitorMountAdded(). Turns out we had a similar
>+null check a bit later in this file in the VolumeRemoved() method,
>+which I copy-pasted here just by replacing the "unmount" word in
>+the log statement with "mount" in this case.
>+---
>+ src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs | 5 +++++
>+ 1 file changed, 5 insertions(+)
>+
>+diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
>+index f1ff6c4..f635b93 100644
>+--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
>++++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
>+@@ -78,6 +78,11 @@ void HandleMonitorMountAdded (object o, MountAddedArgs args)
>+                 return;
>+ 
>+             var device = GudevDeviceFromGioMount (mount);
>++            if (device == null) {
>++                Hyena.Log.Debug (string.Format ("Tried to mount {0}/{1} with no matching udev device", mount.Volume.Name, mount.Volume.Uuid));
>++                return;
>++            }
>++
>+             volume_device_map [mount.Volume.Handle] = device;
>+             var h = DeviceAdded;
>+             if (h != null) {
>+-- 
>+1.9.3
>diff --git a/banshee.spec b/banshee.spec
>index 252e3ae..9a30b05 100644
>--- a/banshee.spec
>+++ b/banshee.spec
>@@ -1,6 +1,6 @@
> Name:    banshee
> Version: 2.6.2
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Summary: Easily import, manage, and play selections from your music collection
> 
> License: MIT
>@@ -12,6 +12,7 @@ Patch2: Initial-port-to-GStreamer-1.0.patch
> Patch3: Remove-build-time-enable-gapless-playback-option.patch
> Patch4: Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
> Patch5: Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
>+Patch6: Dont-try-to-mount-null-devices.patch
> 
> # Mono only available on these:
> ExclusiveArch: %{mono_arches}
>@@ -102,6 +103,7 @@ developing extensions for %{name}.
> %patch3 -p1 -b .gapless
> %patch4 -p1
> %patch5 -p1
>+%patch6 -p1
> 
> %build
> # Snapshots only
>@@ -167,6 +169,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_libdir}/pkgconfig/banshee-*.pc
> 
> %changelog
>+* Tue May 20 2014 Eric "Sparks" Christensen <sparks@fedoraproject.org> - 2.6.2-2
>+- Added patch to fix BZ 1012176
>+
> * Sun Mar 09 2014 Kalev Lember <kalevlember@gmail.com> - 2.6.2-1
> - Update to 2.6.2
> - Fold banshee-musicbrainz into the main package
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1012176: 897765