fixed python-2.5 patch

(Portage version: 2.1.2.12)

2 files changed, 23 insertions, 40 deletions

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index 48d9c7f9ece6..7f200b5e4919 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numeric
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.33 2007/09/02 03:20:38 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.34 2007/09/02 13:41:16 bicatali Exp $
+
+  02 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/numeric-24.2-python25.patch:
+  fixed patch for python-2.5
 
   02 Sep 2007; Markus Dittrich <markusle@gentoo.org>
   files/numeric-24.2-arrayobject.patch, files/numeric-24.2-dotblas.patch,
diff --git a/dev-python/numeric/files/numeric-24.2-python25.patch b/dev-python/numeric/files/numeric-24.2-python25.patch
index 6a44612024fa..3dfae8ebedfe 100644
--- a/dev-python/numeric/files/numeric-24.2-python25.patch
+++ b/dev-python/numeric/files/numeric-24.2-python25.patch
@@ -1,15 +1,6 @@
-diff -Nur Numeric-24.2/Src/arrayobject.c Numeric-24.2.new/Src/arrayobject.c
---- Numeric-24.2/Src/arrayobject.c	2007-05-25 18:34:55.000000000 +0100
-+++ Numeric-24.2.new/Src/arrayobject.c	2007-05-25 18:34:04.000000000 +0100
-@@ -12,7 +12,7 @@
-   performance for heterogeneity.
- */
- 
--/* $Id: numeric-24.2-python25.patch,v 1.2 2007/09/01 22:24:30 bicatali Exp $ */
-+/* $Id: numeric-24.2-python25.patch,v 1.2 2007/09/01 22:24:30 bicatali Exp $ */
- 
- #include "Python.h"
- #include <stddef.h>
+diff -Nur Numeric-24.2.orig/Src/arrayobject.c Numeric-24.2/Src/arrayobject.c
+--- Numeric-24.2.orig/Src/arrayobject.c	2007-09-02 14:12:11.000000000 +0100
++++ Numeric-24.2/Src/arrayobject.c	2007-09-02 14:12:42.000000000 +0100
 @@ -491,7 +491,8 @@
  
  static PyObject * PyArray_Resize(PyArrayObject *self, PyObject *shape) {
@@ -20,6 +11,15 @@ diff -Nur Numeric-24.2/Src/arrayobject.c Numeric-24.2.new/Src/arrayobject.c
      int refcnt;
      int new_dimensions[MAX_DIMS];
      int new_strides[MAX_DIMS];
+@@ -708,7 +709,7 @@
+ }
+ 
+ static PyObject *
+-array_slice(PyArrayObject *self, int ilow, int ihigh)
++array_slice(PyArrayObject *self, Py_ssize_t ilow, Py_ssize_t ihigh)
+ {
+     PyArrayObject *r;
+     int l;
 @@ -776,7 +777,7 @@
  
      if ((item = index2ptr(self, i)) == NULL) return -1;
@@ -141,9 +141,9 @@ diff -Nur Numeric-24.2/Src/arrayobject.c Numeric-24.2.new/Src/arrayobject.c
  
      if (!PySequence_Check(v)) {
  	PyErr_SetString(PyExc_ValueError,"assignment from non-sequence");
-diff -Nur Numeric-24.2/Src/multiarraymodule.c Numeric-24.2.new/Src/multiarraymodule.c
---- Numeric-24.2/Src/multiarraymodule.c	2005-08-16 06:20:25.000000000 +0100
-+++ Numeric-24.2.new/Src/multiarraymodule.c	2007-05-25 18:28:35.000000000 +0100
+diff -Nur Numeric-24.2.orig/Src/multiarraymodule.c Numeric-24.2/Src/multiarraymodule.c
+--- Numeric-24.2.orig/Src/multiarraymodule.c	2007-09-02 14:12:11.000000000 +0100
++++ Numeric-24.2/Src/multiarraymodule.c	2007-09-02 14:12:42.000000000 +0100
 @@ -36,7 +36,8 @@
  extern PyObject *PyArray_Concatenate(PyObject *op) {
      PyArrayObject *ret, **mps;
@@ -184,9 +184,9 @@ diff -Nur Numeric-24.2/Src/multiarraymodule.c Numeric-24.2.new/Src/multiarraymod
      int savespace=0;
      static char all_zero[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
      static char *kwlist[] = {"shape", "typecode", "savespace", NULL};
-diff -Nur Numeric-24.2/Src/ufuncobject.c Numeric-24.2.new/Src/ufuncobject.c
---- Numeric-24.2/Src/ufuncobject.c	2005-08-16 06:20:25.000000000 +0100
-+++ Numeric-24.2.new/Src/ufuncobject.c	2007-05-25 18:28:35.000000000 +0100
+diff -Nur Numeric-24.2.orig/Src/ufuncobject.c Numeric-24.2/Src/ufuncobject.c
+--- Numeric-24.2.orig/Src/ufuncobject.c	2007-09-02 14:12:11.000000000 +0100
++++ Numeric-24.2/Src/ufuncobject.c	2007-09-02 14:12:42.000000000 +0100
 @@ -272,7 +272,7 @@
  
  int setup_matrices(PyUFuncObject *self, PyObject *args,  PyUFuncGenericFunction *function, void **data,
@@ -196,24 +196,3 @@ diff -Nur Numeric-24.2/Src/ufuncobject.c Numeric-24.2.new/Src/ufuncobject.c
  
      nargs = PyTuple_Size(args);
      if ((nargs != self->nin) && (nargs != self->nin+self->nout)) {
-
-From: Daniel Drake <d.drake@mmm.com>
-
-Fix list slicing on python 2.5 
-
-Numeric.arange(0,10) was working fine but Numeric.arange(0,10)[:] was
-returning nonsense. Using the correct data type fixes the problem.
-
-Index: Numeric-24.2/Src/arrayobject.c
-===================================================================
---- Numeric-24.2.orig/Src/arrayobject.c
-+++ Numeric-24.2/Src/arrayobject.c
-@@ -708,7 +708,7 @@ extern PyObject *PyArray_Return(PyArrayO
- }
- 
- static PyObject *
--array_slice(PyArrayObject *self, int ilow, int ihigh)
-+array_slice(PyArrayObject *self, Py_ssize_t ilow, Py_ssize_t ihigh)
- {
-     PyArrayObject *r;
-     int l;