drop patches for Python-2.5 support

4 files changed, 1 insertions, 120 deletions

diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 0e87447385a..165d6acbf5b 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.14 2011/06/30 22:50:21 alnsn Exp $
+$NetBSD: distinfo,v 1.15 2013/03/19 12:19:39 drochner Exp $
 
 SHA1 (py2cairo-1.8.10.tar.gz) = 6bb0b3e0249bce9fc0480aadad0c602d32f26ec1
 RMD160 (py2cairo-1.8.10.tar.gz) = 932e19f2f582bdf5735bdc92720b76edfb0a0c8e
 Size (py2cairo-1.8.10.tar.gz) = 588459 bytes
-SHA1 (patch-aa) = d999b96f0ece317bf39394734079ec1695d2ea9e
-SHA1 (patch-ab) = fea4d5ff3f03414e2014d32fd4a7fb7b5a379100
-SHA1 (patch-ac) = 9047c33f8bd7cdc1e537d3b083b33601bcbe8954
diff --git a/graphics/py-cairo/patches/patch-aa b/graphics/py-cairo/patches/patch-aa
deleted file mode 100644
index 8216255d7c9..00000000000
--- a/graphics/py-cairo/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2011/06/30 22:50:21 alnsn Exp $
-
---- configure.orig	2010-05-20 11:43:23.000000000 +0000
-+++ configure
-@@ -12400,13 +12400,13 @@ fi
- 
-         if test -n "$PYTHON"; then
-       # If the user set $PYTHON, use it and don't search something else.
--      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.6" >&5
--$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
-+$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
-       prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
- # map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
-+minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
- minverhex = 0
- # xrange is not present in Python 3.0 and range returns an iterator
- for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-@@ -12428,8 +12428,8 @@ fi
-     else
-       # Otherwise, try each interpreter until we find one that satisfies
-       # VERSION.
--      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.6" >&5
--$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; }
-+      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
- if test "${am_cv_pathless_PYTHON+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-@@ -12440,7 +12440,7 @@ else
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
- # map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
-+minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
- minverhex = 0
- # xrange is not present in Python 3.0 and range returns an iterator
- for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
diff --git a/graphics/py-cairo/patches/patch-ab b/graphics/py-cairo/patches/patch-ab
deleted file mode 100644
index 8ac02482ff4..00000000000
--- a/graphics/py-cairo/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/08/31 08:04:32 wiz Exp $
-
---- src/matrix.c.orig	2009-08-26 10:59:35.000000000 +0000
-+++ src/matrix.c
-@@ -206,7 +206,7 @@ matrix_translate (PycairoMatrix *o, PyOb
- }
- 
- static PyObject *
--matrix_item (PycairoMatrix *o, Py_ssize_t i) {
-+matrix_item (PycairoMatrix *o, int i) {
-   switch (i) {
-   case 0:
-     return Py_BuildValue("d", o->matrix.xx);
-@@ -265,14 +265,13 @@ static PyNumberMethods matrix_as_number 
-   0,	           /* nb_true_divide */
-   0,		   /* nb_inplace_floor_divide */
-   0,		   /* nb_inplace_true_divide */
--  (unaryfunc)0,	   /* nb_index */
- };
- 
- static PySequenceMethods matrix_as_sequence = {
-   0,                  		/* sq_length */
-   0,                  		/* sq_concat */
-   0,                  		/* sq_repeat */
--  (ssizeargfunc)matrix_item,	/* sq_item */
-+  (intargfunc)matrix_item,	/* sq_item */
-   0,                     	/* sq_slice */
-   0,				/* sq_ass_item */
-   0,				/* sq_ass_slice */
diff --git a/graphics/py-cairo/patches/patch-ac b/graphics/py-cairo/patches/patch-ac
deleted file mode 100644
index cddc20e3d9a..00000000000
--- a/graphics/py-cairo/patches/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/08/31 08:04:32 wiz Exp $
-
---- src/surface.c.orig	2009-08-26 10:59:35.000000000 +0000
-+++ src/surface.c
-@@ -118,7 +118,7 @@ static cairo_status_t
- _write_func (void *closure, const unsigned char *data, unsigned int length) {
-   PyGILState_STATE gstate = PyGILState_Ensure();
-   PyObject *res = PyObject_CallMethod ((PyObject *)closure, "write", "(s#)",
--				       data, (Py_ssize_t)length);
-+				       data, length);
-   if (res == NULL) {
-     /* an exception has occurred, it will be picked up later by
-      * Pycairo_Check_Status()
-@@ -401,7 +401,7 @@ image_surface_create_for_data (PyTypeObj
-   cairo_format_t format;
-   unsigned char *buffer;
-   int width, height, stride = -1, res;
--  Py_ssize_t buffer_len;
-+  int buffer_len;
-   PyObject *obj;
- 
-   if (!PyArg_ParseTuple(args, "Oiii|i:Surface.create_for_data",
-@@ -445,7 +445,7 @@ image_surface_create_for_data (PyTypeObj
- static cairo_status_t
- _read_func (void *closure, unsigned char *data, unsigned int length) {
-   char *buffer;
--  Py_ssize_t str_length;
-+  int str_length;
-   cairo_status_t status = CAIRO_STATUS_READ_ERROR;
-   PyGILState_STATE gstate = PyGILState_Ensure();
-   PyObject *pystr = PyObject_CallMethod ((PyObject *)closure, "read", "(i)",
-@@ -585,10 +585,10 @@ image_surface_buffer_getsegcount (Pycair
- 
- /* See Python C API Manual 10.7 */
- static PyBufferProcs image_surface_as_buffer = {
--  (readbufferproc) image_surface_buffer_getreadbuf,
--  (writebufferproc)image_surface_buffer_getwritebuf,
--  (segcountproc)   image_surface_buffer_getsegcount,
--  (charbufferproc) NULL,
-+  (getreadbufferproc) image_surface_buffer_getreadbuf,
-+  (getwritebufferproc)image_surface_buffer_getwritebuf,
-+  (getsegcountproc)   image_surface_buffer_getsegcount,
-+  (getcharbufferproc) NULL,
- };
- 
- static PyMethodDef image_surface_methods[] = {