diff options
Diffstat (limited to 'media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch')
| -rw-r--r-- | media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch b/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch new file mode 100644 index 0000000..8980dad --- /dev/null +++ b/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch @@ -0,0 +1,41 @@ +From aeeb165117a80080b044d54d5dc8b64df3128c26 Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew <jonathan@kaolin.wh9.net> +Date: Fri, 07 May 2010 12:23:17 +0000 +Subject: Fix version requirements for PyGTK + +pygtk.require() actually needs the major GTK+ version, and +doesn't use the minor version in the require. + +Also make sure to check for the return value to avoid surprises. + +https://bugzilla.gnome.org/show_bug.cgi?id=617821 +--- +diff --git a/src/plugins/totem-python-module.c b/src/plugins/totem-python-module.c +index 5db787d..7eee97c 100644 +--- a/src/plugins/totem-python-module.c ++++ b/src/plugins/totem-python-module.c +@@ -151,7 +151,7 @@ totem_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, check your installation"); +@@ -161,7 +161,12 @@ totem_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 ("Could not get required pygtk version, check your installation"); ++ PyErr_Print(); ++ return; ++ } + + /* import gobject */ + init_pygobject (); +-- +cgit v0.8.3.1 |