Fix building with recent glibc wrt #333373 by Michael Weber.

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

1 files changed, 48 insertions, 0 deletions

diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch
new file mode 100644
index 000000000000..b32614e2030b
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch
@@ -0,0 +1,48 @@
+From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 01 Jun 2010 00:55:27 +0000
+Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199)
+
+---
+diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
+index 648dd2f..5bb34a2 100644
+--- a/remote/dbus/rb-client.c
++++ b/remote/dbus/rb-client.c
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
+ static gboolean notify = FALSE;
+ 
+ static gboolean play = FALSE;
+-static gboolean pause = FALSE;
++static gboolean do_pause = FALSE;
+ static gboolean play_pause = FALSE;
+ static gboolean stop = FALSE;
+ 
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
+ 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
+ 
+ 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
+-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
++	{ "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
+ 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
+ /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
+ 
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
+ 	if (next || previous ||
+ 	    clear_queue ||
+ 	    play_uri || other_stuff ||
+-	    play || pause || play_pause || stop ||
++	    play || do_pause || play_pause || stop ||
+ 	    print_playing || print_playing_format || notify ||
+ 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
+ 		no_present = TRUE;
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
+ 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
+ 	if (!annoy (&error)) {
+ 		rb_debug ("playback state: %d", is_playing);
+-		if (play || pause || play_pause) {
++		if (play || do_pause || play_pause) {
+ 			if (is_playing != play || play_pause) {
+ 				rb_debug ("calling playPause to change playback state");
+ 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
+--
+cgit v0.8.3.1