Fix bug #282546, application crashed when song properties was opened, Patch import from upstream bug #590108. Clean up old revision.

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

4 files changed, 64 insertions, 14 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index d36df0b83827..1977df65f3cd 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.155 2009/08/23 21:25:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.156 2009/08/24 20:51:23 mrpouet Exp $
+
+*rhythmbox-0.12.3-r2 (24 Aug 2009)
+
+  24 Aug 2009; Romain Perier <mrpouet@gentoo.org>
+  -rhythmbox-0.12.3-r1.ebuild, +rhythmbox-0.12.3-r2.ebuild,
+  +files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch:
+  Fix bug #282546, application crashed when song properties was opened,
+  Patch import from upstream bug #590108.
+  Clean up old revision.
 
   23 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -rhythmbox-0.12.2-r1.ebuild, -files/rhythmbox-0.12.2-link-fixes.patch,
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 156421c8d31c..57c04355fd86 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8
 AUX rhythmbox-0.12.3-lastfm.patch 764 RMD160 3f2b8edeb7e03d102541f6ddb0788e2c23009809 SHA1 80ac030d5811440e636358e6d548d2b5faba1f5e SHA256 5efd050bb9c8eae04bb9442d5ee298f2abb58a2409529f4561b9ed9acdb3a9a3
+AUX rhythmbox-0.12.3-sigsegv-no-saveable-types.patch 1425 RMD160 2c7f9eb6f3d29e556876d1e31c2b8dbd1f7593bd SHA1 fd8b81a32972f7d98d302b8b12614b2869373902 SHA256 b223144e3e51de17895963e23d289d568ca7f4de673bf342cf0698fa196cd68a
 DIST rhythmbox-0.11.6.tar.bz2 4683400 RMD160 3fd6b8595705a91c779c458a26333575ba5e2233 SHA1 4364447bd4f6fb0e969039213cea37d6d3e4fb58 SHA256 687f566817a0c1c6a2c0e9cc462bb10cded39b8d22b224fa55be00ae1cbdc151
 DIST rhythmbox-0.12.3.tar.bz2 4999529 RMD160 8fc030b320065578b4a0851ecd87c5753b6dce93 SHA1 f1def95f92993ade14f7b0ec2323e9d2e4aaad03 SHA256 7069442a13d94424bf1916c600c5dbb320190a9c3a03f65c4770fc96558ac305
 EBUILD rhythmbox-0.11.6-r1.ebuild 4615 RMD160 ebff53ac9f76bdca4fa9c9cdd484a1cf8f1174b2 SHA1 eac8c8362f023fea11312e2fd8ad8f9598dc9cfe SHA256 888e1faa9bc55bc49a9f013f98a548e9bad8000a57542090071e38f63ca20641
-EBUILD rhythmbox-0.12.3-r1.ebuild 4333 RMD160 84d0604174d8765ae18429451e15028e89b91516 SHA1 92696915cdbbc2a1ad67e7fce05a003f6dcf16ae SHA256 bf4b6511e8ae264f8fbd0b74a75de8299793381f7d04685aca69d4923810afa2
-MISC ChangeLog 23142 RMD160 f32e9376a577078ef4583f1e5c81ef6e2a6ad7d7 SHA1 a94e7097529795d865cf0092458f5f68cc6528f9 SHA256 7b55a209ec3d4eb65fd080481b7a50d4f43a7f62eef3a78d8676a580c9306cad
+EBUILD rhythmbox-0.12.3-r2.ebuild 4486 RMD160 771b74b4022a21ac55633a5425bcb7ce3738169f SHA1 96468e66e25631c41a061a52468c7bdd5c33dc8e SHA256 1659ae03a93fea21a438bc14a9d1f4195e2114ecd41996d146331f41339fd1b0
+MISC ChangeLog 23491 RMD160 10c8f9f18e4400373d64a40237d096328d66a32c SHA1 b6f8aa41477d1d10188638a7e18a72e10d72fe6e SHA256 63dc53a71804bbaa34a8b86bda4d2672698b57391a7228ec35029d924f115104
 MISC metadata.xml 419 RMD160 8b8a38779ea642d4a89cce79dc00b53c0c06676e SHA1 813dcd9fa754f027cc01ec74380e594aa1e148c6 SHA256 bd5fea9a6884f59afaecd6bb32c5f535452f65e23e82d669bf7b82b92a19da88
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqRs8wACgkQ1fmVwcYIWAb/+QCfUCVFoWMy2sUAl1wk8u9XyZR0
-hIMAoKZ2k8bFNm+W5U5DoYRbkS21UiIZ
-=k/g6
------END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch
new file mode 100644
index 000000000000..8a2ede61f386
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch
@@ -0,0 +1,46 @@
+From 47a5f4753d1cfcd2bcc2de10daeaa7a71f598d5d Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Wed, 29 Jul 2009 10:36:48 +0000
+Subject: metadata: don't crash if there are no saveable types (bug #590108)
+
+---
+diff --git a/metadata/rb-metadata-dbus-client.c b/metadata/rb-metadata-dbus-client.c
+index 8683446..30e1760 100644
+--- a/metadata/rb-metadata-dbus-client.c
++++ b/metadata/rb-metadata-dbus-client.c
+@@ -349,9 +349,13 @@ start_metadata_service (GError **error)
+ 		return FALSE;
+ 	}
+ 
+-	saveable_type_list = g_strjoinv (", ", saveable_types);
+-	rb_debug ("saveable types from metadata helper: %s", saveable_type_list);
+-	g_free (saveable_type_list);
++	if (saveable_types != NULL) {
++		saveable_type_list = g_strjoinv (", ", saveable_types);
++		rb_debug ("saveable types from metadata helper: %s", saveable_type_list);
++		g_free (saveable_type_list);
++	} else {
++		rb_debug ("unable to save metadata for any file types");
++	}
+ 
+ 	if (message)
+ 		dbus_message_unref (message);
+@@ -704,10 +708,12 @@ rb_metadata_can_save (RBMetaData *md, const char *mimetype)
+ 		}
+ 	}
+ 
+-	for (i = 0; saveable_types[i] != NULL; i++) {
+-		if (g_str_equal (mimetype, saveable_types[i])) {
+-			result = TRUE;
+-			break;
++	if (saveable_types != NULL) {
++		for (i = 0; saveable_types[i] != NULL; i++) {
++			if (g_str_equal (mimetype, saveable_types[i])) {
++				result = TRUE;
++				break;
++			}
+ 		}
+ 	}
+ 
+--
+cgit v0.8.2
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.3-r2.ebuild
index 1f7fbd5d905b..2e0353924f97 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.3-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/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild,v 1.2 2009/08/23 21:25:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.3-r2.ebuild,v 1.1 2009/08/24 20:51:23 mrpouet Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.10"
@@ -132,6 +132,10 @@ src_prepare() {
 	# Fix last.fm plugin linking, bug #276972
 	epatch "${FILESDIR}/${P}-lastfm.patch"
 
+	# Fix bug #282546, don't crash if there are no saveable types
+	# (upstream bug #590108)
+	epatch "${FILESDIR}/${P}-sigsegv-no-saveable-types.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautomake
 }