Author: arekm Date: Mon Nov 3 07:23:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from gentoo
---- Files affected:
SOURCES:
python-numarray-refcount.patch (NONE -> 1.1) (NEW),
python-numarray-python25.patch (NONE -> 1.1) (NEW),
python-numarray-includes.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/python-numarray-refcount.patch
diff -u /dev/null SOURCES/python-numarray-refcount.patch:1.1
--- /dev/null Mon Nov 3 08:23:30 2008
+++ SOURCES/python-numarray-refcount.patch Mon Nov 3 08:23:23 2008
@@ -0,0 +1,10 @@
+--- Src/libnumarray.ch 2006-08-24 19:38:15.000000000 +0100
++++ Src/libnumarray.ch.new 2007-02-08 16:10:49.000000000 +0000
+@@ -877,6 +877,7 @@
+ if (!buf) return NULL;
+ } else {
+ buf = Py_None;
++ Py_INCREF(buf);
+ }
+
+ a = NA_NewAllFromBuffer( nd, dimensions, descr->type_num, buf,
================================================================
Index: SOURCES/python-numarray-python25.patch
diff -u /dev/null SOURCES/python-numarray-python25.patch:1.1
--- /dev/null Mon Nov 3 08:23:30 2008
+++ SOURCES/python-numarray-python25.patch Mon Nov 3 08:23:23 2008
@@ -0,0 +1,40 @@
+--- Src/_ndarraymodule.c.orig 2007-09-05 09:54:58.759967037 +0100
++++ Src/_ndarraymodule.c 2007-09-05 09:54:36.098675644 +0100
+@@ -596,12 +596,12 @@
+
+ /* Copied from Python-2.3.3 Objects/sliceobject.c */
+ int
+-_GetIndicesEx(PySliceObject *r, int length,
+- int *start, int *stop, int *step, int *slicelength)
++_GetIndicesEx(PySliceObject *r, Py_ssize_t length,
++ Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
Py_ssize_t *slicelength)
+ {
+ /* this is harder to get right than you might think */
+
+- int defstart, defstop;
++ Py_ssize_t defstart, defstop;
+
+ if (r->step == Py_None) {
+ *step = 1;
+@@ -706,7 +706,7 @@
+ self->nd = _snip( self->nd, self->dimensions,
dim);
+ self->nstrides = _snip( self->nstrides, self->strides,
dim);
+ } else if (PySlice_Check(slice)) {
+- int start, stop, step, strided;
++ Py_ssize_t start, stop, step, strided;
+ if (_GetIndicesEx( (PySliceObject *) slice,
+ self->dimensions[dim],
+ &start, &stop, &step, &strided) < 0)
+@@ -718,9 +718,9 @@
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+- self->byteoffset += self->strides[dim] * start;
+- self->dimensions[dim] = strided;
+- self->strides[dim] *= step;
++ self->byteoffset += (maybelong) (self->strides[dim] *
start);
++ self->dimensions[dim] = (maybelong) strided;
++ self->strides[dim] *= (maybelong) step;
+ ++ dim;
+ } else {
+ Py_DECREF(rest);
================================================================
Index: SOURCES/python-numarray-includes.patch
diff -u /dev/null SOURCES/python-numarray-includes.patch:1.1
--- /dev/null Mon Nov 3 08:23:31 2008
+++ SOURCES/python-numarray-includes.patch Mon Nov 3 08:23:24 2008
@@ -0,0 +1,56 @@
+diff -Nur Include.orig/numarray/arraybase.h Include/numarray/arraybase.h
+--- Include.orig/numarray/arraybase.h 2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/arraybase.h 2007-02-08 16:07:30.000000000 +0000
+@@ -1,6 +1,8 @@
+ #if !defined(_arraybase_h)
+ #define _arraybase_h 1
+
++#include <Python.h>
++
+ #if defined(SIZEOF_VOID_P)
+ #if SIZEOF_VOID_P == 8
+ #define LP64 1
+@@ -17,6 +19,8 @@
+ #define HAS_UINT64 1
+ #endif
+
++#include "numconfig.h"
++
+ #define REFCOUNT(obj) (((PyObject *)(obj))->ob_refcnt)
+ #define MAX_ELSIZE 16
+
+diff -Nur Include.orig/numarray/cfunc.h Include/numarray/cfunc.h
+--- Include.orig/numarray/cfunc.h 2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/cfunc.h 2007-02-08 16:07:30.000000000 +0000
+@@ -1,6 +1,8 @@
+ #if !defined(__cfunc__)
+ #define __cfunc__ 1
+
++#include <Python.h>
++
+ typedef PyObject *(*CFUNCasPyValue)(void *);
+ typedef int (*UFUNC)(long, long, long, void **, long*);
+ /* typedef void (*CFUNC_2ARG)(long, void *, void *); */
+diff -Nur Include.orig/numarray/nummacro.h Include/numarray/nummacro.h
+--- Include.orig/numarray/nummacro.h 2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/nummacro.h 2007-02-08 16:07:30.000000000 +0000
+@@ -1,6 +1,8 @@
+ #if !defined(_ndarraymacro)
+ #define _ndarraymacro
+
++#include <Python.h>
++
+ /* The structs defined here are private implementation details of numarray
+ which are subject to change w/o notice.
+ */
+diff -Nur Include.orig/numarray/tc.h Include/numarray/tc.h
+--- Include.orig/numarray/tc.h 2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/tc.h 2007-02-08 16:07:30.000000000 +0000
+@@ -1,5 +1,7 @@
+ #if defined(MEASURE_TIMING)
+
++#include <Python.h>
++
+ /* ----------------------------------------------------------------------- */
+
+ typedef struct
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
