Second half of fix for bug 274819 -- changing default sink in pulseaudio crashes g-s-d

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 46 insertions, 14 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index f3dde9ad1fb3..b29b7c029603 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.32 2009/06/17 23:14:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.33 2009/09/12 12:02:27 nirbheek Exp $
+
+*gnome-settings-daemon-2.26.1-r2 (12 Sep 2009)
+
+  12 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-settings-daemon-2.26.1-r1.ebuild,
+  +gnome-settings-daemon-2.26.1-r2.ebuild,
+  +files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch:
+  Second half of fix for bug 274819 -- changing default sink in pulseaudio
+  crashes g-s-d
 
   18 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-settings-daemon-2.24.1-r1.ebuild,
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index c89927a1c654..b05c4017015d 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
 AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663
 AUX gnome-settings-daemon-2.24.1-gnomedesktop-api.patch 2873 RMD160 8545d4e60fdc72f4153732eadfb93aecee282aed SHA1 e0711aa4382ce93b38a50357530371014a3e6de4 SHA256 9c569aaa2bd9c48771c3c13768a071c3dc999abb0def0e6cac59c7f1976a9996
+AUX gnome-settings-daemon-2.26.1-crash-default-sink-change.patch 1212 RMD160 684648d8336370f1b3c356d39e8b79f5e740c36a SHA1 0aa4f61332f751003b280647b37fd9fc5add93e3 SHA256 86515630893732368bac39cd44362b3c13db6f058ca5940a6ae2e1f4c4fdc4f0
 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
 DIST gnome-settings-daemon-2.26.1-readd-gst-vol-control-support.patch.bz2 7669 RMD160 dc616c73606981af7f47e01973d2f1881fceed04 SHA1 e0194dc45dbfd57da9eead92f4c9c0e586f8eb9f SHA256 4bb694a0ea484c6d74baf2e252c6e9ddb153a3467b480fe55ba18373312fda81
 DIST gnome-settings-daemon-2.26.1.tar.bz2 1084129 RMD160 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd SHA1 0c2cef37a0a3333c314a8205cefea9edb8f0669a SHA256 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80
 EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2363 RMD160 e3da03a7077faa4952ebec4b2334b329b7e8be96 SHA1 831776c2a099e3cb58fab10ba6b76aa70f9ec9ce SHA256 efa82d6f58dd0970f7f245618c8480642389bb3c972afd00bfec0440455c8050
 EBUILD gnome-settings-daemon-2.24.1-r2.ebuild 2478 RMD160 fd9e9524d98c2100d3cc24e4538e7d6889beb471 SHA1 ff0f72094197758414b8e43796724622980749b1 SHA256 6a30a60c34050d82667f60dd5279487d9198e1b2e35cb4bb09aec5d338ab9b74
-EBUILD gnome-settings-daemon-2.26.1-r1.ebuild 1925 RMD160 f6f201130a8eeb65fa7100376c040660b329253b SHA1 5c32a8c9825f008efa61b537d2d4d9d6e858938c SHA256 2aa683669ffd4bdbea8f7be3f225d9994ceb45c9c6a6d7a7f82f44e0868480da
-MISC ChangeLog 6043 RMD160 619223b046a08b5e9fccf45c3dcfb0e4b6059867 SHA1 acd97494816f9a60a7fa5202935b33a768aa541a SHA256 1bb043b4266c11686b761d9429b4f8157c23aeb99dea1ace1773321493cdc07d
+EBUILD gnome-settings-daemon-2.26.1-r2.ebuild 2086 RMD160 6537e59817f99ca1d24f6075225976f09a42419d SHA1 5262e4dc7414bc765cbcd6c3f55b2ec76e11e0cf SHA256 743ec222fc603732b4e84a619d28ed71601ae6d1a5d42f6c75aacbeec39e27ee
+MISC ChangeLog 6399 RMD160 b6ae6f2d5fd764ebdd23010c671a91b2a8609ad6 SHA1 18de4ff43350769fc324e8ff0892a1352926a6c1 SHA256 d0a00138adce2921e0edb9da0e3217c3f710b3fdd23050f433744a994dad7177
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko5lQ4ACgkQ1fmVwcYIWAZ/DACgrA6E7LWDrHwnUATBzjgJvaQJ
-sRUAn1mLwc6PAznX6ercD3lmOOK4ppTa
-=7Aig
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch
new file mode 100644
index 000000000000..5b688fd55f0e
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch
@@ -0,0 +1,28 @@
+Second part of fix for bug 274819 -- g-s-d crashes when default sink changes
+
+Taken from upstream git repository
+
+---
+From 5b73218d9170626162fca03425ac7f0b4789bc0f Mon Sep 17 00:00:00 2001
+From: Chris Coulson <chrisccoulson@googlemail.com>
+Date: Fri, 31 Jul 2009 15:59:36 +0000
+Subject: Bug 590073 – gnome-settings-daemon crashed with SIGSEGV in gvc_mixer_stream_is_running()
+
+Fix crasher when the default sink changes, we were unref'ing
+streams, when never ref'ing them.
+---
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index 3eeea71..8438875 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -740,7 +740,7 @@ update_default_sink (GsdMediaKeysManager *manager)
+         }
+ 
+         if (stream != NULL) {
+-                manager->priv->stream = stream;
++                manager->priv->stream = g_object_ref (stream);
+                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::volume",
+                                   G_CALLBACK (on_stream_event_notify), manager);
+                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::is-muted",
+--
+cgit v0.8.2
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild
index bb12dbbea212..07e15db95c18 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r1.ebuild,v 1.1 2009/05/10 23:01:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild,v 1.1 2009/09/12 12:02:27 nirbheek Exp $
 
 EAPI="2"
 
@@ -68,6 +68,10 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Fix bug 274819 -- g-s-d crashes when pulseaudio default sink changes
+	# (not needed in 2.28)
+	epatch "${FILESDIR}/${P}-crash-default-sink-change.patch"
+
 	# Restore gstreamer volume control support, upstream bug #571145
 	epatch "${WORKDIR}/${P}-readd-gst-vol-control-support.patch"