Author: goetz
Date: Sat Feb 10 00:22:02 2007
New Revision: 118669
Added:
packages/cooker/rhythmbox/current/SOURCES/rhythmbox-python-plugins.patch
Modified:
packages/cooker/rhythmbox/current/SPECS/rhythmbox.spec
Log:
try to fix bug #28015 (python plugins on 64 bit)
Added: packages/cooker/rhythmbox/current/SOURCES/rhythmbox-python-plugins.patch
==============================================================================
--- (empty file)
+++ packages/cooker/rhythmbox/current/SOURCES/rhythmbox-python-plugins.patch
Sat Feb 10 00:22:02 2007
@@ -0,0 +1,27 @@
+Index: plugins/rb-python-module.c
+===================================================================
+--- plugins/rb-python-module.c (revision 4785)
++++ plugins/rb-python-module.c (working copy)
+@@ -34,6 +34,13 @@
+ #include "rb-python-plugin.h"
+ #include "rb-debug.h"
+
++#if PY_VERSION_HEX < 0x02050000
++typedef int Py_ssize_t;
++#define PY_SSIZE_T_MAX INT_MAX
++#define PY_SSIZE_T_MIN INT_MIN
++#endif
++
++
+ #define RB_PYTHON_MODULE_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE
((object), \
+ RB_TYPE_PYTHON_MODULE, \
+ RBPythonModulePrivate))
+@@ -260,7 +267,7 @@
+ RBPythonModulePrivate *priv = RB_PYTHON_MODULE_GET_PRIVATE (gmodule);
+ PyObject *main_module, *main_locals, *locals, *key, *value;
+ PyObject *module, *fromlist;
+- int pos = 0;
++ Py_ssize_t pos = 0;
+
+ main_module = PyImport_AddModule ("__main__");
+ if (main_module == NULL)
Modified: packages/cooker/rhythmbox/current/SPECS/rhythmbox.spec
==============================================================================
--- packages/cooker/rhythmbox/current/SPECS/rhythmbox.spec (original)
+++ packages/cooker/rhythmbox/current/SPECS/rhythmbox.spec Sat Feb 10
00:22:02 2007
@@ -1,6 +1,6 @@
%define version 0.9.7
-%define release %mkrel 3
+%define release %mkrel 4
%if %mdkversion >= 200610
%define gstreamer 0.10.0
@@ -21,6 +21,8 @@
Source2: %name-16.png
# gw from Fedora, fix icon transparency problem
Patch: rhythmbox-0.9.7-use-icon-name.patch
+# gw fix python plugins on 64 bit
+Patch1: rhythmbox-python-plugins.patch
URL: http://www.rhythmbox.org
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libgnomeui2-devel
@@ -91,6 +93,7 @@
%prep
%setup -q
%patch -p1 -b .use-icon-name
+%patch1 -p0 -b .python
%build
