pkg/41063: graphics/py-cairo: Update to 1.8.4 (patch included)

[leuzi%trash.net@localhost]

>Number:         41063
>Category:       pkg
>Synopsis:       graphics/py-cairo: Update to 1.8.4 (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 23 22:55:00 +0000 2009
>Originator:     Christoph Leuzinger
>Release:        4.0
>Organization:
>Environment:
NetBSD charon 4.0 NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:20:10 PST 2007  
builds@wb34:/home/builds/ab/netbsd-4-0-RELEASE/i386/200712160005Z-obj/home/builds/ab/netbsd-4-0-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
>Description:
Overview of changes from pycairo 1.8.2 to pycairo 1.8.4
=======================================================
General Changes:
    Pycairo 1.8.4 requires cairo 1.8.4 (or later) and Python 2.6

Bug Fixes:
    20674: Add get/set_extend for Gradient Patterns

New Classes:
    cairo.ToyFontFace

New Methods:
    Pattern.get_extend
    Pattern.set_extend
    ToyFontFace.get_family
    ToyFontFace.get_slant
    ToyFontFace.get_weight

Deleted Methods:
    SurfacePattern.get_extend
    SurfacePattern.set_extend

Other Changes:
    Threading for surfaces with stream functions has been reenabled.
    Documentation updates.

>How-To-Repeat:

>Fix:
--- Makefile    11 Feb 2009 14:23:32 -0000      1.16
+++ Makefile    23 Mar 2009 22:41:33 -0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/02/11 14:23:32 joerg Exp $
+# $NetBSD$
 #
 
-DISTNAME=              pycairo-1.8.2
+DISTNAME=              pycairo-1.8.4
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=            graphics
 MASTER_SITES=          http://cairographics.org/releases/
@@ -28,7 +28,7 @@
 BUILDLINK_TRANSFORM+=  rm:-std=c99
 .endif
 
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.8.0
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.8.4nb1
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
--- distinfo    18 Jan 2009 17:12:56 -0000      1.9
+++ distinfo    23 Mar 2009 22:41:33 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.9 2009/01/18 17:12:56 wiz Exp $
 
-SHA1 (pycairo-1.8.2.tar.gz) = b457949ccfa3af82afcffae8a396a1c840a9428a
-RMD160 (pycairo-1.8.2.tar.gz) = ce48a6b71b802f07d0e0d3cfa140fd39ab5fe4d7
-Size (pycairo-1.8.2.tar.gz) = 519064 bytes
-SHA1 (patch-aa) = 1177a5421d80273721a80603dbd4cfca0fdf1b18
+SHA1 (pycairo-1.8.4.tar.gz) = 450b59376ffea41910f60a0dfc9fd01d277e3950
+RMD160 (pycairo-1.8.4.tar.gz) = 1be18a8516d797694d370f0d02273cad18115320
+Size (pycairo-1.8.4.tar.gz) = 521136 bytes
+SHA1 (patch-aa) = 887dd3204505dfbaff5989920d0cc5a99a8f14ff
 SHA1 (patch-ab) = e8fcf835f97b38df476f09d7bcfe1f84b0264aa3
-SHA1 (patch-ac) = 93cc7fa29f90872dad22b83bc783acf9f1279093
+SHA1 (patch-ac) = 87eae672fc11ce849304a2ef409f06d826c59802
--- patches/patch-aa    18 Nov 2008 12:46:52 -0000      1.3
+++ patches/patch-aa    23 Mar 2009 22:41:33 -0000
@@ -1,12 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2008/11/18 12:46:52 drochner Exp $
+$NetBSD$
 
---- configure.orig     2008-11-18 12:40:01.000000000 +0100
+--- configure.orig
 +++ configure
-@@ -19384,7 +19384,7 @@ echo $ECHO_N "checking whether $PYTHON v
+@@ -19941,12 +19941,12 @@
+ 
+         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, string
  # split strings by '.' and convert to numeric.  Append some zeros
  # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
+-minver = map(int, string.split('2.6', '.')) + [0, 0, 0]
 +minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
  minverhex = 0
  for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
--- patches/patch-ac    18 Nov 2008 12:46:52 -0000      1.1
+++ patches/patch-ac    23 Mar 2009 22:41:33 -0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2008/11/18 12:46:52 drochner Exp $
+$NetBSD$
 
---- cairo/pycairo-surface.c.orig       2008-11-18 12:50:34.000000000 +0100
+--- cairo/pycairo-surface.c.orig
 +++ cairo/pycairo-surface.c
-@@ -122,7 +122,7 @@ static cairo_status_t
- _write_func (void *closure, const unsigned char *data, unsigned int length)
+@@ -123,7 +123,7 @@
  {
+     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()
-@@ -392,7 +392,7 @@ image_surface_create_for_data (PyTypeObj
+@@ -393,7 +393,7 @@ image_surface_create_for_data (PyTypeObj
      cairo_format_t format;
      unsigned char *buffer;
      int width, height, stride = -1, res;
@@ -20,7 +20,7 @@
      PyObject *obj;
  
      if (!PyArg_ParseTuple(args, "Oiii|i:Surface.create_for_data",
-@@ -570,10 +570,10 @@ image_surface_buffer_getsegcount (Pycair
+@@ -571,10 +571,10 @@ image_surface_buffer_getsegcount (Pycair
  
  /* See Python C API Manual 10.7 */
  static PyBufferProcs image_surface_as_buffer = {