| 1 |
ssuominen 10/08/19 18:21:57 |
| 2 |
|
| 3 |
Added: rhythmbox-0.12.8-namespace-conflict.patch |
| 4 |
Log: |
| 5 |
Fix building with recent glibc wrt #333373 by Michael Weber. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: rhythmbox-0.12.8-namespace-conflict.patch |
| 15 |
=================================================================== |
| 16 |
From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001 |
| 17 |
From: Jonathan Matthew <jonathan@××××.org> |
| 18 |
Date: Tue, 01 Jun 2010 00:55:27 +0000 |
| 19 |
Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199) |
| 20 |
|
| 21 |
--- |
| 22 |
diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c |
| 23 |
index 648dd2f..5bb34a2 100644 |
| 24 |
--- a/remote/dbus/rb-client.c |
| 25 |
+++ b/remote/dbus/rb-client.c |
| 26 |
@@ -54,7 +54,7 @@ static gboolean previous = FALSE; |
| 27 |
static gboolean notify = FALSE; |
| 28 |
|
| 29 |
static gboolean play = FALSE; |
| 30 |
-static gboolean pause = FALSE; |
| 31 |
+static gboolean do_pause = FALSE; |
| 32 |
static gboolean play_pause = FALSE; |
| 33 |
static gboolean stop = FALSE; |
| 34 |
|
| 35 |
@@ -91,7 +91,7 @@ static GOptionEntry args[] = { |
| 36 |
{ "notify", 0, 0, G_OPTION_ARG_NONE, ¬ify, N_("Show notification of the playing song"), NULL }, |
| 37 |
|
| 38 |
{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL }, |
| 39 |
- { "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL }, |
| 40 |
+ { "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL }, |
| 41 |
{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL }, |
| 42 |
/* { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */ |
| 43 |
|
| 44 |
@@ -608,7 +608,7 @@ main (int argc, char **argv) |
| 45 |
if (next || previous || |
| 46 |
clear_queue || |
| 47 |
play_uri || other_stuff || |
| 48 |
- play || pause || play_pause || stop || |
| 49 |
+ play || do_pause || play_pause || stop || |
| 50 |
print_playing || print_playing_format || notify || |
| 51 |
(set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01)) |
| 52 |
no_present = TRUE; |
| 53 |
@@ -696,7 +696,7 @@ main (int argc, char **argv) |
| 54 |
org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error); |
| 55 |
if (!annoy (&error)) { |
| 56 |
rb_debug ("playback state: %d", is_playing); |
| 57 |
- if (play || pause || play_pause) { |
| 58 |
+ if (play || do_pause || play_pause) { |
| 59 |
if (is_playing != play || play_pause) { |
| 60 |
rb_debug ("calling playPause to change playback state"); |
| 61 |
org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error); |
| 62 |
-- |
| 63 |
cgit v0.8.3.1 |
Archives