Dear nautilus-python maintainers, I intend to NMU nautilus-python to fix the following two bugs: #512310 - does not load extensions on archs where int isn't the same as Py_ssize_t #512394 - nautilus freezes/crashes when extension calls file.get_vfs_file_info()
The debdiff is attached, are there any objections from your side? Regards Evgeni -- Bruce Schneier Fact Number 277: Bruce Schneier counted an infinite set. Backwards.
diff -u nautilus-python-0.4.3/debian/changelog nautilus-python-0.4.3/debian/changelog
--- nautilus-python-0.4.3/debian/changelog
+++ nautilus-python-0.4.3/debian/changelog
@@ -1,3 +1,15 @@
+nautilus-python (0.4.3-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 30_use-Py_ssize_t.patch to make nautilus-python work
+ with python2.5 on arches where int isn't the same as Py_ssize_t.
+ Closes: #512310
+ * Add 40_init-gnomevfs.patch to stop freezing when gnomevfs isn't
+ initialized.
+ Closes: #512394, LP: #114189
+
+ -- Evgeni Golov <sarge...@die-welt.net> Tue, 20 Jan 2009 12:42:44 +0100
+
nautilus-python (0.4.3-3) unstable; urgency=medium
* debian/patches/dlopen-nasty.patch:
only in patch2:
unchanged:
--- nautilus-python-0.4.3.orig/debian/patches/40_init-gnomevfs.patch
+++ nautilus-python-0.4.3/debian/patches/40_init-gnomevfs.patch
@@ -0,0 +1,20 @@
+=== modified file 'nautilus-python-0.4.3/src/nautilusmodule.c'
+--- nautilus-python-0.4.3/src/nautilusmodule.c 2007-11-30 13:59:46 +0000
++++ nautilus-python-0.4.3/src/nautilusmodule.c 2007-12-02 08:27:18 +0000
+@@ -27,6 +27,7 @@
+ /* include this first, before NO_IMPORT_PYGOBJECT is defined */
+ #include <pygobject.h>
+ #include <pygtk/pygtk.h>
++#include "pygnomevfs.h"
+
+ void pynautilus_register_classes (PyObject *d);
+ void pynautilus_add_constants(PyObject *module, const gchar *strip_prefix);
+@@ -45,6 +46,7 @@
+
+ init_pygobject ();
+ init_pygtk ();
++ init_pygnomevfs();
+
+ m = Py_InitModule ("nautilus", pynautilus_functions);
+ d = PyModule_GetDict (m);
+
only in patch2:
unchanged:
--- nautilus-python-0.4.3.orig/debian/patches/30_use-Py_ssize_t.patch
+++ nautilus-python-0.4.3/debian/patches/30_use-Py_ssize_t.patch
@@ -0,0 +1,52 @@
+2008-01-11 Jonathan Rogers <jon...@teegra.net>
+ reviewed by: Johan Dahlin
+
+ * src/nautilus-python-object.c:
+ * src/nautilus-python.c: (nautilus_python_load_file):
+ * src/nautilus-python.h:
+ Use Py_ssize_t instead of int, so nautilus-python works on Python 2.5
+ fixes #444366
+
+Index: nautilus-python/src/nautilus-python.c
+===================================================================
+--- nautilus-python/src/nautilus-python.c (revision 47)
++++ nautilus-python/src/nautilus-python.c (revision 48)
+@@ -114,7 +114,7 @@
+ PyObject *main_module, *main_locals, *locals, *key, *value;
+ PyObject *module;
+ GType gtype;
+- int pos = 0;
++ Py_ssize_t pos = 0;
+
+ debug_enter_args("filename=%s", filename);
+
+Index: nautilus-python/src/nautilus-python-object.c
+===================================================================
+--- nautilus-python/src/nautilus-python-object.c (revision 47)
++++ nautilus-python/src/nautilus-python-object.c (revision 48)
+@@ -74,7 +74,7 @@
+
+ #define HANDLE_LIST(py_ret, type, type_name) \
+ { \
+- int i = 0; \
++ Py_ssize_t i = 0; \
+ if (!PySequence_Check(py_ret) || PyString_Check(py_ret)) { \
+ PyErr_SetString(PyExc_TypeError, \
+ METHOD_NAME " must return a sequence"); \
+Index: nautilus-python/src/nautilus-python.h
+===================================================================
+--- nautilus-python/src/nautilus-python.h (revision 47)
++++ nautilus-python/src/nautilus-python.h (revision 48)
+@@ -26,6 +26,12 @@
+ #include <glib/gprintf.h>
+ #include <Python.h>
+
++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
++typedef int Py_ssize_t;
++#define PY_SSIZE_T_MAX INT_MAX
++#define PY_SSIZE_T_MIN INT_MIN
++#endif
++
+ typedef enum {
+ NAUTILUS_PYTHON_DEBUG_MISC = 1 << 0,
+ } NautilusPythonDebug;
pgpYADWluiW9D.pgp
Description: PGP signature
