Tue Nov 18 12:46:52 2008 UTC ()
make this work with python-2.4 again


(drochner)
diff -r1.11 -r1.12 pkgsrc/graphics/py-cairo/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/py-cairo/distinfo
diff -r0 -r1.3 pkgsrc/graphics/py-cairo/patches/patch-aa
diff -r0 -r1.1 pkgsrc/graphics/py-cairo/patches/patch-ab
diff -r0 -r1.1 pkgsrc/graphics/py-cairo/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/sysutils/py-notify/Makefile
diff -r1.57 -r1.58 pkgsrc/x11/py-gnome2/Makefile
diff -r1.23 -r1.24 pkgsrc/x11/py-gnome2-desktop/Makefile
diff -r1.53 -r1.54 pkgsrc/x11/py-gtk2/Makefile

cvs diff -r1.11 -r1.12 pkgsrc/graphics/py-cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-cairo/Makefile 2008/11/10 22:10:08 1.11
+++ pkgsrc/graphics/py-cairo/Makefile 2008/11/18 12:46:52 1.12
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.11 2008/11/10 22:10:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2008/11/18 12:46:52 drochner Exp $
2# 2#
3 3
4DISTNAME= pycairo-1.6.4 4DISTNAME= pycairo-1.6.4
5PKGNAME= ${PYPKGPREFIX}-cairo-1.6.4 5PKGNAME= ${PYPKGPREFIX}-cairo-1.6.4
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://cairographics.org/releases/ 7MASTER_SITES= http://cairographics.org/releases/
8 8
9MAINTAINER= leuzi@trash.net 9MAINTAINER= leuzi@trash.net
10HOMEPAGE= http://cairographics.org/pycairo/ 10HOMEPAGE= http://cairographics.org/pycairo/
11COMMENT= Python bindings for cairo 11COMMENT= Python bindings for cairo
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 19CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
20 20
21PKGCONFIG_OVERRIDE+= pycairo.pc.in 21PKGCONFIG_OVERRIDE+= pycairo.pc.in
22PYTHON_VERSIONS_ACCEPTED= 25 22PYTHON_VERSIONS_ACCEPTED= 24 25
23PY_PATCHPLIST= yes 23PY_PATCHPLIST= yes
24 24
25.include "../../mk/compiler.mk" 25.include "../../mk/compiler.mk"
26 26
27.if !empty(CC_VERSION:Mgcc-2*) 27.if !empty(CC_VERSION:Mgcc-2*)
28BUILDLINK_TRANSFORM+= rm:-std=c99 28BUILDLINK_TRANSFORM+= rm:-std=c99
29.endif 29.endif
30 30
31BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4 31BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4
32 32
33.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
34.include "../../math/py-Numeric/buildlink3.mk" 34.include "../../math/py-Numeric/buildlink3.mk"
35.include "../../graphics/cairo/buildlink3.mk" 35.include "../../graphics/cairo/buildlink3.mk"

cvs diff -r1.6 -r1.7 pkgsrc/graphics/py-cairo/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-cairo/distinfo 2008/11/10 22:10:08 1.6
+++ pkgsrc/graphics/py-cairo/distinfo 2008/11/18 12:46:52 1.7
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.6 2008/11/10 22:10:08 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2008/11/18 12:46:52 drochner Exp $
2 2
3SHA1 (pycairo-1.6.4.tar.gz) = d3b3ecb6e999cc7b4a6ebcad00ae8d82c253c21c 3SHA1 (pycairo-1.6.4.tar.gz) = d3b3ecb6e999cc7b4a6ebcad00ae8d82c253c21c
4RMD160 (pycairo-1.6.4.tar.gz) = 6197427df3d10b708847503f975670e3d02d57e5 4RMD160 (pycairo-1.6.4.tar.gz) = 6197427df3d10b708847503f975670e3d02d57e5
5Size (pycairo-1.6.4.tar.gz) = 491984 bytes 5Size (pycairo-1.6.4.tar.gz) = 491984 bytes
 6SHA1 (patch-aa) = 1177a5421d80273721a80603dbd4cfca0fdf1b18
 7SHA1 (patch-ab) = e8fcf835f97b38df476f09d7bcfe1f84b0264aa3
 8SHA1 (patch-ac) = 93cc7fa29f90872dad22b83bc783acf9f1279093

File Added: pkgsrc/graphics/py-cairo/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.3 2008/11/18 12:46:52 drochner Exp $

--- configure.orig	2008-11-18 12:40:01.000000000 +0100
+++ configure
@@ -19384,7 +19384,7 @@ echo $ECHO_N "checking whether $PYTHON v
       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.4', '.')) + [0, 0, 0]
 minverhex = 0
 for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
 sys.exit(sys.hexversion < minverhex)"

File Added: pkgsrc/graphics/py-cairo/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2008/11/18 12:46:52 drochner Exp $

--- cairo/pycairo-matrix.c.orig	2008-11-18 12:43:06.000000000 +0100
+++ cairo/pycairo-matrix.c
@@ -206,7 +206,7 @@ matrix_transform_point (PycairoMatrix *o
 }
 
 static PyObject *
-matrix_item (PycairoMatrix *o, Py_ssize_t i)
+matrix_item (PycairoMatrix *o, int i)
 {
     switch (i) {
     case 0:
@@ -266,14 +266,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 */

File Added: pkgsrc/graphics/py-cairo/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2008/11/18 12:46:52 drochner Exp $

--- cairo/pycairo-surface.c.orig	2008-11-18 12:50:34.000000000 +0100
+++ cairo/pycairo-surface.c
@@ -122,7 +122,7 @@ static cairo_status_t
 _write_func (void *closure, const unsigned char *data, unsigned int length)
 {
     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
     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",
@@ -570,10 +570,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[] = {

cvs diff -r1.6 -r1.7 pkgsrc/sysutils/py-notify/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/py-notify/Makefile 2008/11/15 08:15:06 1.6
+++ pkgsrc/sysutils/py-notify/Makefile 2008/11/18 12:46:52 1.7
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2008/11/15 08:15:06 hasso Exp $ 1# $NetBSD: Makefile,v 1.7 2008/11/18 12:46:52 drochner Exp $
2# 2#
3 3
4DISTNAME= notify-python-0.1.1 4DISTNAME= notify-python-0.1.1
5PKGNAME= ${PYPKGPREFIX}-notify-0.1.1 5PKGNAME= ${PYPKGPREFIX}-notify-0.1.1
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= \ 8MASTER_SITES= \
9 http://www.galago-project.org/files/releases/source/notify-python/ 9 http://www.galago-project.org/files/releases/source/notify-python/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.galago-project.org/ 13HOMEPAGE= http://www.galago-project.org/
14COMMENT= Python bindings for libnotify 14COMMENT= Python bindings for libnotify
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
21 21
22PKGCONFIG_OVERRIDE+= notify-python-0.1.1/notify-python.pc.in 22PKGCONFIG_OVERRIDE+= notify-python-0.1.1/notify-python.pc.in
23PYTHON_VERSIONS_ACCEPTED= 25 23PYTHON_VERSIONS_ACCEPTED= 24 25
24PY_PATCHPLIST= yes 24PY_PATCHPLIST= yes
25 25
26.include "../../lang/python/extension.mk" 26.include "../../lang/python/extension.mk"
27.include "../../x11/py-gtk2/buildlink3.mk" 27.include "../../x11/py-gtk2/buildlink3.mk"
28.include "../../sysutils/libnotify/buildlink3.mk" 28.include "../../sysutils/libnotify/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"

cvs diff -r1.57 -r1.58 pkgsrc/x11/py-gnome2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gnome2/Makefile 2008/11/14 22:01:27 1.57
+++ pkgsrc/x11/py-gnome2/Makefile 2008/11/18 12:46:52 1.58
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.57 2008/11/14 22:01:27 hasso Exp $ 1# $NetBSD: Makefile,v 1.58 2008/11/18 12:46:52 drochner Exp $
2# 2#
3 3
4DISTNAME= gnome-python-2.22.3 4DISTNAME= gnome-python-2.22.3
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
6CATEGORIES= x11 python 6CATEGORIES= x11 python
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/2.22/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/2.22/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Python binding for GNOME2 12COMMENT= Python binding for GNOME2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16PY_PATCHPLIST= YES 16PY_PATCHPLIST= YES
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in 18PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in
19GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
20CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 20CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
21USE_TOOLS+= pkg-config gmake 21USE_TOOLS+= pkg-config gmake
22 22
23PYTHON_VERSIONS_ACCEPTED= 25 23PYTHON_VERSIONS_ACCEPTED= 24 25
24 24
25.include "../../lang/python/extension.mk" 25.include "../../lang/python/extension.mk"
26.include "../../lang/python/application.mk" 26.include "../../lang/python/application.mk"
27 27
28BUILDLINK_API_DEPENDS.GConf+= GConf>=2.11.1 28BUILDLINK_API_DEPENDS.GConf+= GConf>=2.11.1
29.include "../../devel/GConf/buildlink3.mk" 29.include "../../devel/GConf/buildlink3.mk"
30.include "../../devel/glib2/buildlink3.mk" 30.include "../../devel/glib2/buildlink3.mk"
31.include "../../devel/libbonobo/buildlink3.mk" 31.include "../../devel/libbonobo/buildlink3.mk"
32.include "../../devel/libbonoboui/buildlink3.mk" 32.include "../../devel/libbonoboui/buildlink3.mk"
33.include "../../devel/libgnome/buildlink3.mk" 33.include "../../devel/libgnome/buildlink3.mk"
34.include "../../devel/libgnomeui/buildlink3.mk" 34.include "../../devel/libgnomeui/buildlink3.mk"
35.include "../../graphics/libgnomecanvas/buildlink3.mk" 35.include "../../graphics/libgnomecanvas/buildlink3.mk"
36BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1 36BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1

cvs diff -r1.23 -r1.24 pkgsrc/x11/py-gnome2-desktop/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gnome2-desktop/Attic/Makefile 2008/11/13 11:17:16 1.23
+++ pkgsrc/x11/py-gnome2-desktop/Attic/Makefile 2008/11/18 12:46:52 1.24
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.23 2008/11/13 11:17:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2008/11/18 12:46:52 drochner Exp $
2# 2#
3 3
4DISTNAME= gnome-python-desktop-2.24.0 4DISTNAME= gnome-python-desktop-2.24.0
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.24/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Python modules for the GNOME desktop 12COMMENT= Python modules for the GNOME desktop
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17PY_PATCHPLIST= yes 17PY_PATCHPLIST= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config gmake 19USE_TOOLS+= pkg-config gmake
20 20
21DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy 21DEPENDS+= bug-buddy>=2.16:../../net/bug-buddy
22 22
23PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in 23PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in
24 24
25PYTHON_VERSIONS_ACCEPTED= 25 25PYTHON_VERSIONS_ACCEPTED= 24 25
26 26
27# XXX not yet, needs hal 27# XXX not yet, needs hal
28PLIST_VARS+= nautilusburn 28PLIST_VARS+= nautilusburn
29#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk" 29#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
30 30
31CONFIGURE_ARGS+= --disable-evolution 31CONFIGURE_ARGS+= --disable-evolution
32CONFIGURE_ARGS+= --disable-evolution_ecal 32CONFIGURE_ARGS+= --disable-evolution_ecal
33 33
34.include "../../graphics/py-cairo/buildlink3.mk" 34.include "../../graphics/py-cairo/buildlink3.mk"
35.include "../../graphics/librsvg/buildlink3.mk" 35.include "../../graphics/librsvg/buildlink3.mk"
36.include "../../multimedia/gnome-media/buildlink3.mk" 36.include "../../multimedia/gnome-media/buildlink3.mk"
37.include "../../x11/gnome-desktop/buildlink3.mk" 37.include "../../x11/gnome-desktop/buildlink3.mk"
38.include "../../x11/gnome-panel/buildlink3.mk" 38.include "../../x11/gnome-panel/buildlink3.mk"

cvs diff -r1.53 -r1.54 pkgsrc/x11/py-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gtk2/Makefile 2008/11/17 21:56:16 1.53
+++ pkgsrc/x11/py-gtk2/Makefile 2008/11/18 12:46:52 1.54
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.53 2008/11/17 21:56:16 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.54 2008/11/18 12:46:52 drochner Exp $
2# 2#
3 3
4DISTNAME= pygtk-2.13.0 4DISTNAME= pygtk-2.13.0
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= x11 python 7CATEGORIES= x11 python
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.13/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.13/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= recht@NetBSD.org 11MAINTAINER= recht@NetBSD.org
12HOMEPAGE= http://www.gnome.org/ 12HOMEPAGE= http://www.gnome.org/
13COMMENT= Python bindings for GTK+2 13COMMENT= Python bindings for GTK+2
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10 17CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10
18 18
19PY_PATCHPLIST= YES 19PY_PATCHPLIST= YES
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
21PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in 21PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in
22GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
23CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 23CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
24USE_TOOLS+= gmake pkg-config 24USE_TOOLS+= gmake pkg-config
25 25
26PYTHON_VERSIONS_ACCEPTED= 25 26PYTHON_VERSIONS_ACCEPTED= 24 25
27 27
28BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3 28BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.3
29 29
30.include "../../devel/libglade/buildlink3.mk" 30.include "../../devel/libglade/buildlink3.mk"
31.include "../../graphics/py-cairo/buildlink3.mk" 31.include "../../graphics/py-cairo/buildlink3.mk"
32.include "../../lang/python/extension.mk" 32.include "../../lang/python/extension.mk"
33.include "../../lang/python/application.mk" 33.include "../../lang/python/application.mk"
34.include "../../math/py-Numeric/buildlink3.mk" 34.include "../../math/py-Numeric/buildlink3.mk"
35.include "../../devel/py-gobject/buildlink3.mk" 35.include "../../devel/py-gobject/buildlink3.mk"
36.include "../../x11/gtk2/buildlink3.mk" 36.include "../../x11/gtk2/buildlink3.mk"
37 37
38.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"