#! /bin/sh /usr/share/dpatch/dpatch-run ## 16_pymem_del.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad pymol-1.1~beta3~/contrib/modules/ExtensionClass.c-py152 pymol-1.1~beta3/contrib/modules/ExtensionClass.c-py152 --- pymol-1.1~beta3~/contrib/modules/ExtensionClass.c-py152 2008-02-15 12:55:26.000000000 -0500 +++ pymol-1.1~beta3/contrib/modules/ExtensionClass.c-py152 2008-03-05 23:12:29.000000000 -0500 @@ -1589,7 +1589,7 @@ Py_DECREF(self->bases); } if (((PyExtensionClass*)self->ob_type) != self) Py_XDECREF(self->ob_type); - PyMem_DEL(self); + PyObject_Del(self); } static PyObject * @@ -2999,7 +2999,7 @@ UNLESS(base_dealloced) { Py_DECREF(self->ob_type); - PyMem_DEL(self); + PyObject_Del(self); } PyErr_Restore(t,v,tb); diff -urNad pymol-1.1~beta3~/contrib/pyopengl/_glumodule.c pymol-1.1~beta3/contrib/pyopengl/_glumodule.c --- pymol-1.1~beta3~/contrib/pyopengl/_glumodule.c 2008-02-15 12:55:27.000000000 -0500 +++ pymol-1.1~beta3/contrib/pyopengl/_glumodule.c 2008-03-05 23:12:29.000000000 -0500 @@ -117,7 +117,7 @@ { if (op->quad) gluDeleteQuadric(op->quad); - PyMem_DEL(op); + PyObject_Del(op); } static PyObject *gluquadric_getattr(gluQuadricObject * op, char *name) @@ -198,7 +198,7 @@ { if (op->tess) gluDeleteTess(op->tess); - PyMem_DEL(op); + PyObject_Del(op); } static PyObject *glutesselator_getattr(gluTesselatorPyObject * op, char *name) diff -urNad pymol-1.1~beta3~/contrib/pyopengl/_openglmodule.c pymol-1.1~beta3/contrib/pyopengl/_openglmodule.c --- pymol-1.1~beta3~/contrib/pyopengl/_openglmodule.c 2008-02-15 12:55:27.000000000 -0500 +++ pymol-1.1~beta3/contrib/pyopengl/_openglmodule.c 2008-03-05 23:12:29.000000000 -0500 @@ -175,7 +175,7 @@ #include "abstract.h" -#define PyArray_ClearMemory(op, pitems) PyMem_DEL(pitems) +#define PyArray_ClearMemory(op, pitems) PyObject_Del(pitems) static int PyArray_AsDoubleArray(PyObject ** op, GLdouble ** pitems, int *pn) { @@ -3385,7 +3385,7 @@ for (i = 0; i < nitems; i++) { PyTuple_SET_ITEM(params, i, PyFloat_FromDouble(items[i])); } - PyMem_DEL(items); + PyObject_Del(items); #endif /* NUMERIC */ return (PyObject *) params; } diff -urNad pymol-1.1~beta3~/contrib/pyopengl/openglutil.c pymol-1.1~beta3/contrib/pyopengl/openglutil.c --- pymol-1.1~beta3~/contrib/pyopengl/openglutil.c 2008-02-15 12:55:27.000000000 -0500 +++ pymol-1.1~beta3/contrib/pyopengl/openglutil.c 2008-03-05 23:12:29.000000000 -0500 @@ -154,7 +154,7 @@ } } - PyMem_DEL(buf); + PyObject_Del(buf); TIFFFlushData(tif); TIFFClose(tif); @@ -192,7 +192,7 @@ fwrite(pixelbuffer + i * width * 3, 1, width * 3, fp); fclose(fp); - PyMem_DEL(pixelbuffer); + PyObject_Del(pixelbuffer); Py_INCREF(Py_None); return Py_None; @@ -332,7 +332,7 @@ fprintf(fp, "grestore\n"); fclose(fp); - PyMem_DEL(pixels); + PyObject_Del(pixels); Py_INCREF(Py_None); return Py_None; @@ -1972,7 +1972,7 @@ } static void PyObjtrackball_dealloc(PyObjtrackball * self) { - PyMem_DEL(self); + PyObject_Del(self); } static int PyObjtrackball_print(PyObjtrackball * self) diff -urNad pymol-1.1~beta3~/contrib/pyopengl/openglutil.h pymol-1.1~beta3/contrib/pyopengl/openglutil.h --- pymol-1.1~beta3~/contrib/pyopengl/openglutil.h 2008-02-15 12:55:27.000000000 -0500 +++ pymol-1.1~beta3/contrib/pyopengl/openglutil.h 2008-03-05 23:12:29.000000000 -0500 @@ -78,7 +78,7 @@ #include "abstract.h" -#define PyArray_ClearMemory(op, pitems) PyMem_DEL(pitems) +#define PyArray_ClearMemory(op, pitems) PyObject_Del(pitems) static int PyArray_AsDoubleArray(PyObject ** op, GLdouble ** pitems, int *pn) { diff -urNad pymol-1.1~beta3~/contrib/sglite/sglitemodule.c pymol-1.1~beta3/contrib/sglite/sglitemodule.c --- pymol-1.1~beta3~/contrib/sglite/sglitemodule.c 2008-02-15 12:55:25.000000000 -0500 +++ pymol-1.1~beta3/contrib/sglite/sglitemodule.c 2008-03-05 23:12:29.000000000 -0500 @@ -229,7 +229,7 @@ static void DEL_SgOpsObject(T_SgOps *self) { - PyMem_DEL(self); + PyObject_Del(self); } @@ -829,7 +829,7 @@ static void DEL_EqMIxObject(T_EqMIx *self) { - PyMem_DEL(self); + PyObject_Del(self); }