cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from upstream:

Browse Source 
rename 'pause' to avoid conflict with pause(2) (bug #620199)

Needed for the upcoming glib2 update.

thanks to landry@ for the bulk result
This commit is contained in:
ajacoutot 2010-09-29 07:42:59 +00:00
parent b26e4781b1
commit a539078e1a
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/rhythmbox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.58 2010/09/25 18:13:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.59 2010/09/29 07:42:59 ajacoutot Exp $
# coherence plugin is installed but not activated by default so we don't
# enforce dependency on multimedia/coherence to lower requirements
@ -8,7 +8,7 @@ COMMENT= music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 0.12.8
REVISION = 6
REVISION = 7
SHARED_LIBS += rhythmbox-core 0.0 # .0.0

45
audio/rhythmbox/patches/patch-remote_dbus_rb-client_c Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-remote_dbus_rb-client_c,v 1.1 2010/09/29 07:42:59 ajacoutot Exp $
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)
--- remote/dbus/rb-client.c.orig Thu Mar 25 01:10:14 2010
+++ remote/dbus/rb-client.c Wed Sep 29 09:11:04 2010
@@ -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);