[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug #681374 cherry picked upstream patch



Dear release team,

with the patch from the upstream commit it is possible to fix this Bug.
I've attached a debdiff of the package with the patch applied.

I hope you can make use of this and possibly add it to proposed updates.

Regards,
Marcel Meißner
diff -Nru rhythmbox-2.97/debian/changelog rhythmbox-2.97/debian/changelog
--- rhythmbox-2.97/debian/changelog	2012-07-28 03:42:01.000000000 +0200
+++ rhythmbox-2.97/debian/changelog	2013-07-21 14:13:17.000000000 +0200
@@ -1,3 +1,11 @@
+rhythmbox (2.97-2.2) UNRELEASED; urgency=normal
+
+  * Non-maintainer upload.
+  * fix rhythmbox not resuming from pause on audio-cd playback
+    (Closes: #681374)
+
+ -- Marcel Meißner <mm-meissner@gmx.de>  Sun, 21 Jul 2013 12:43:21 +0200
+
 rhythmbox (2.97-2.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -Nru rhythmbox-2.97/debian/patches/series rhythmbox-2.97/debian/patches/series
--- rhythmbox-2.97/debian/patches/series	2012-07-27 22:40:37.000000000 +0200
+++ rhythmbox-2.97/debian/patches/series	2013-07-21 13:12:24.000000000 +0200
@@ -1,2 +1,3 @@
 rb-mb5.patch
 CVE-2012-3355.patch
+shell-player-clear-playlist.patch
diff -Nru rhythmbox-2.97/debian/patches/shell-player-clear-playlist.patch rhythmbox-2.97/debian/patches/shell-player-clear-playlist.patch
--- rhythmbox-2.97/debian/patches/shell-player-clear-playlist.patch	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-2.97/debian/patches/shell-player-clear-playlist.patch	2013-07-21 13:16:14.000000000 +0200
@@ -0,0 +1,20 @@
+From: Jonathan Matthew <jonathan@d14n.org>
+Subject: shell-player: clear playlist parser cancellable when pausing
+Origin: upstream, https://git.gnome.org/browse/rhythmbox;a=commitdiff;h=98e5a25b3c32c9915357968a78783c1ac21c7130
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=663440
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681374
+Index: rhythmbox-2.97/shell/rb-shell-player.c
+===================================================================
+--- rhythmbox-2.97.orig/shell/rb-shell-player.c	2012-06-03 10:03:15.000000000 +0200
++++ rhythmbox-2.97/shell/rb-shell-player.c	2013-07-21 13:12:53.588599603 +0200
+@@ -2378,6 +2378,10 @@
+ 			rb_debug ("playing source is already NULL");
+ 		} else if (rb_source_can_pause (player->priv->source)) {
+ 			rb_debug ("pausing mm player");
++			if (player->priv->parser_cancellable != NULL) {
++				g_object_unref (player->priv->parser_cancellable);
++				player->priv->parser_cancellable = NULL;
++			}
+ 			rb_player_pause (player->priv->mmplayer);
+ 			songs = rb_source_get_entry_view (player->priv->current_playing_source);
+ 			if (songs)

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: