[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-13-3-gfd10d54

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 37e07433c41c770b4bc0f357cb051b80205f3883
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 1 18:54:00 2011 +0200

    Import Barry Warsaw's patch to fix build with Python 2.7

diff --git a/debian/patches/0003-Wrap-PyEval_CallObject.patch b/debian/patches/0003-Wrap-PyEval_CallObject.patch
new file mode 100644
index 0000000..38f58aa
--- /dev/null
+++ b/debian/patches/0003-Wrap-PyEval_CallObject.patch
@@ -0,0 +1,38 @@
+From: Barry Warsaw <barry at ubuntu.com>
+Date: Fri, 1 Jul 2011 18:54:55 +0200
+Subject: Wrap PyEval_CallObject
+
+PyEval_CallObject became a macro in Python 2.7, so it needs a wrapper
+to compile properly.
+
+Bug-Ubuntu: http://bugs.launchpad.net/ubuntu/+source/pycaml/+bug/688862
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632329
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ pycaml_ml.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/pycaml_ml.c b/pycaml_ml.c
+index 3557869..59b30ed 100644
+--- a/pycaml_ml.c
++++ b/pycaml_ml.c
+@@ -920,6 +920,9 @@ PyObject * wrap_Py_CompileString(const char *str, const char *p, int s) {
+ PyObject *wrap_PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist) {
+   return PyImport_ImportModuleEx(name, globals, locals, fromlist);
+ }
++PyObject *wrap_PyEval_CallObject(PyObject *func, PyObject *arg) {
++  return PyEval_CallObject(func, arg);
++}
+ 
+ 
+ /* Create the function table */
+@@ -1165,7 +1168,7 @@ python_func_table the_python_func_table[] = {
+ /* 42 */
+ { (void *)PyEval_CallObjectWithKeywords, 42, "PyEval_CallObjectWithKeywords" },
+ /* 17 */
+-{ (void *)PyEval_CallObject, 17, "PyEval_CallObject" },
++{ (void *)wrap_PyEval_CallObject, 17, "PyEval_CallObject" },
+ 
+ /* 29 */
+ { (void *)PyEval_GetBuiltins, 29, "PyEval_GetBuiltins" },
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 59bd9ca..852953b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Wrap-Py_-calls.patch
 0002-Removal-of-PyRange_New.patch
+0003-Wrap-PyEval_CallObject.patch

-- 
pycaml packaging