diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
commit | 2e4d2e942a99fbc51adebabc4cd543a91491ba37 (patch) | |
tree | 5fb7c33c9eb700d394e22ec7c7faf4258b91ea3b /audio/rhythmbox/files | |
parent | 2d95636f2e1c4896bca367221f0b972b5903e72a (diff) | |
download | marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.gz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.bz2 marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.lz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.xz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.zst marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.zip |
Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of
focus issues. And it doesn't seem it getting any traction upstream.
Next stop GNOME 3.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/rhythmbox/files')
-rw-r--r-- | audio/rhythmbox/files/patch-configure | 11 | ||||
-rw-r--r-- | audio/rhythmbox/files/patch-podcast_rb-podcast-parse.h | 10 | ||||
-rw-r--r-- | audio/rhythmbox/files/patch-python | 171 | ||||
-rw-r--r-- | audio/rhythmbox/files/patch-remote_dbus_rb-client.c | 38 |
4 files changed, 0 insertions, 230 deletions
diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure deleted file mode 100644 index 9e512187f..000000000 --- a/audio/rhythmbox/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2009-03-21 13:56:32.000000000 -0400 -+++ configure 2009-03-21 13:57:17.000000000 -0400 -@@ -20763,7 +20763,7 @@ else - fi - - --MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/mozilla/plugins"}" -+MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR}" - - - if test x$enable_browser_plugin = xyes; then diff --git a/audio/rhythmbox/files/patch-podcast_rb-podcast-parse.h b/audio/rhythmbox/files/patch-podcast_rb-podcast-parse.h deleted file mode 100644 index 2208b3205..000000000 --- a/audio/rhythmbox/files/patch-podcast_rb-podcast-parse.h +++ /dev/null @@ -1,10 +0,0 @@ ---- podcast/rb-podcast-parse.h.orig Mon Nov 28 13:51:28 2005 -+++ podcast/rb-podcast-parse.h Mon Nov 28 13:51:05 2005 -@@ -22,6 +22,7 @@ - #ifndef RB_PODCAST_PARSE_H - #define RB_PODCAST_PARSE_H - -+#include <inttypes.h> - #include <glib.h> - - typedef struct diff --git a/audio/rhythmbox/files/patch-python b/audio/rhythmbox/files/patch-python deleted file mode 100644 index 567b4ee9a..000000000 --- a/audio/rhythmbox/files/patch-python +++ /dev/null @@ -1,171 +0,0 @@ -From 4394826f36fad0ad36ea773b6d4525dfcfcd389b Mon Sep 17 00:00:00 2001 -From: Jonathan Matthew <jonathan@d14n.org> -Date: Wed, 05 May 2010 12:58:26 +0000 -Subject: python: fix a number of python initialization problems (bug #617587) - -- pygtk.require("2.8") doesn't work - it's only after a major version, - so we should pass in "2.0" instead -- init_pygobject() is deprecated, use pygobject_init (and pass in the - version we require) instead -- init_pygtk() is a macro that returns from the current function on - error, so we need to call it from a separate function for our error - handling to work -- if some aspect of python initialization failed, we were still using - the pygobject GIL macros, which were crashing ---- -diff --git a/shell/main.c b/shell/main.c -index 1f27fee..a4dd50a 100644 ---- shell/main.c -+++ shell/main.c -@@ -35,6 +35,7 @@ - #define NO_IMPORT_PYGOBJECT - #define NO_IMPORT_PYGTK - #include <pygobject.h> -+#include "rb-python-module.h" - - /* make sure it's defined somehow */ - #ifndef _XOPEN_SOURCE -@@ -327,11 +328,15 @@ main (int argc, char **argv) - - rb_profile_start ("mainloop"); - #ifdef ENABLE_PYTHON -- pyg_begin_allow_threads; --#endif -+ if (rb_python_init_successful ()) { -+ pyg_begin_allow_threads; -+ gtk_main (); -+ pyg_end_allow_threads; -+ } else { -+ gtk_main (); -+ } -+#else - gtk_main (); --#ifdef ENABLE_PYTHON -- pyg_end_allow_threads; - #endif - rb_profile_end ("mainloop"); - -diff --git a/shell/rb-python-module.c b/shell/rb-python-module.c -index 9e14731..1995a42 100644 ---- shell/rb-python-module.c -+++ shell/rb-python-module.c -@@ -84,8 +84,16 @@ extern PyMethodDef pyrb_functions[]; - /* We retreive this to check for correct class hierarchy */ - static PyTypeObject *PyRBPlugin_Type; - -+static gboolean python_init_successful; -+ - G_DEFINE_TYPE (RBPythonModule, rb_python_module, G_TYPE_TYPE_MODULE); - -+static void -+actually_init_pygtk (void) -+{ -+ init_pygtk (); -+} -+ - void - rb_python_module_init_python (void) - { -@@ -98,6 +106,7 @@ rb_python_module_init_python (void) - char *argv[] = { "rb", "rhythmdb", NULL }; - GList *paths; - -+ python_init_successful = FALSE; - if (Py_IsInitialized ()) { - g_warning ("Python Should only be initialized once, since it's in class_init"); - g_return_if_reached (); -@@ -130,7 +139,7 @@ rb_python_module_init_python (void) - - PySys_SetArgv (1, argv); - -- /* pygtk.require("2.8") */ -+ /* pygtk.require("2.0") */ - pygtk = PyImport_ImportModule ("pygtk"); - if (pygtk == NULL) { - g_warning ("Could not import pygtk"); -@@ -140,11 +149,15 @@ rb_python_module_init_python (void) - - mdict = PyModule_GetDict (pygtk); - require = PyDict_GetItemString (mdict, "require"); -- PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.8"))); -+ PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.0"))); -+ if (PyErr_Occurred ()) { -+ g_warning ("pygtk.require(2.0) failed"); -+ PyErr_Print(); -+ return; -+ } - - /* import gobject */ -- init_pygobject (); -- if (PyErr_Occurred ()) { -+ if (pygobject_init (2, 16, 0) == NULL) { - g_warning ("Could not initialize pygobject"); - PyErr_Print(); - return; -@@ -154,7 +167,7 @@ rb_python_module_init_python (void) - pyg_disable_warning_redirections (); - - /* import gtk */ -- init_pygtk (); -+ actually_init_pygtk (); - if (PyErr_Occurred ()) { - g_warning ("Could not initialize pygtk"); - PyErr_Print(); -@@ -172,7 +185,7 @@ rb_python_module_init_python (void) - - mdict = PyModule_GetDict (gtk); - pygtk_version = PyDict_GetItemString (mdict, "pygtk_version"); -- pygtk_required_version = Py_BuildValue ("(iii)", 2, 4, 0); -+ pygtk_required_version = Py_BuildValue ("(iii)", 2, 8, 0); - if (PyObject_Compare (pygtk_version, pygtk_required_version) == -1) { - g_warning("PyGTK %s required, but %s found.", - PyString_AsString (PyObject_Repr (pygtk_required_version)), -@@ -264,6 +277,8 @@ rb_python_module_init_python (void) - gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, GNOMELOCALEDIR); - PyObject_CallObject (install, gettext_args); - Py_DECREF (gettext_args); -+ -+ python_init_successful = TRUE; - } - - static gboolean -@@ -329,6 +344,11 @@ rb_python_module_load_with_gil (GTypeModule *module) - PyGILState_STATE state; - gboolean ret; - -+ if (python_init_successful == FALSE) { -+ g_warning ("unable to load module as python runtime could not be initialized"); -+ return FALSE; -+ } -+ - state = pyg_gil_state_ensure (); - ret = rb_python_module_load (module); - pyg_gil_state_release (state); -@@ -485,6 +505,12 @@ rb_python_module_new (const gchar *path, - return result; - } - -+gboolean -+rb_python_init_successful (void) -+{ -+ return python_init_successful; -+} -+ - /* --- these are not module methods, they are here out of convenience --- */ - - #if 0 -diff --git a/shell/rb-python-module.h b/shell/rb-python-module.h -index 5b2c152..30c1200 100644 ---- shell/rb-python-module.h -+++ shell/rb-python-module.h -@@ -60,6 +60,8 @@ GObject *rb_python_module_new_object (RBPythonModule *module); - - void rb_python_module_init_python (void); - -+gboolean rb_python_init_successful (void); -+ - void rb_python_garbage_collect (void); - - void rb_python_shutdown (void); --- -cgit v0.8.3.1 diff --git a/audio/rhythmbox/files/patch-remote_dbus_rb-client.c b/audio/rhythmbox/files/patch-remote_dbus_rb-client.c deleted file mode 100644 index c73cde0dc..000000000 --- a/audio/rhythmbox/files/patch-remote_dbus_rb-client.c +++ /dev/null @@ -1,38 +0,0 @@ ---- remote/dbus/rb-client.c.orig 2010-10-10 11:56:07.000000000 -0400 -+++ remote/dbus/rb-client.c 2010-10-10 11:57:02.000000000 -0400 -@@ -54,7 +54,7 @@ static gboolean previous = FALSE; - static gboolean notify = FALSE; - - static gboolean play = FALSE; --static gboolean pause = FALSE; -+static gboolean rbpause = FALSE; - static gboolean play_pause = FALSE; - static gboolean stop = FALSE; - -@@ -91,7 +91,7 @@ static GOptionEntry args[] = { - { "notify", 0, 0, G_OPTION_ARG_NONE, ¬ify, 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, &rbpause, 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 || rbpause || 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 || rbpause || 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); |