diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-23 09:43:48 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-23 09:43:48 +0800 |
| commit | 1decef1e21748b0edb566d476abda7156b7cce95 (patch) | |
| tree | 12fea5c2bd25e065a812a92db74026aecc1b0f54 | |
| parent | 654448783985159dceff267387d6e3e2e84d6e19 (diff) | |
| download | marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar.gz marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar.bz2 marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar.lz marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar.xz marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.tar.zst marcuscom-ports-1decef1e21748b0edb566d476abda7156b7cce95.zip | |
- Fix build on 4.x
- Always disable pygtk support (just for safe mesure.)
- Remove pygtk stuff from plist.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4294 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | graphics/py-cairo/Makefile | 7 | ||||
| -rw-r--r-- | graphics/py-cairo/files/patch-cairo_pycairo-font.c | 19 | ||||
| -rw-r--r-- | graphics/py-cairo/pkg-plist | 1 |
3 files changed, 25 insertions, 2 deletions
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 7dd76bd79..3c39a3cc6 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-cairo/Makefile,v 1.6 2005/07/22 23:32:22 marcus Exp $ +# $MCom: ports/graphics/py-cairo/Makefile,v 1.7 2005/07/22 23:37:35 ahze Exp $ # PORTNAME= cairo @@ -25,6 +25,7 @@ USE_PYTHON= yes USE_REINPLACE= yes USE_GNOME= gnometarget gnomehack USE_AUTOTOOLS= libtool:15 +CONFIGURE_ARGS= --without-pygtk .include <bsd.port.pre.mk> @@ -42,5 +43,9 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in +.if ${OSVERSION} < 500000 + @${REINPLACE_CMD} -e 's|-std=c99||' \ + ${WRKSRC}/configure +.endif .include <bsd.port.post.mk> diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c new file mode 100644 index 000000000..e4e921e5b --- /dev/null +++ b/graphics/py-cairo/files/patch-cairo_pycairo-font.c @@ -0,0 +1,19 @@ +--- cairo/pycairo-font.c.orig Fri Jul 22 21:34:39 2005 ++++ cairo/pycairo-font.c Fri Jul 22 21:35:38 2005 +@@ -183,6 +183,7 @@ + { + PycairoFontFace *ff; + PycairoMatrix *mx1, *mx2; ++ PyObject *o; + + if (!PyArg_ParseTuple(args, "O!O!O!:ScaledFont.__init__", + &PycairoFontFace_Type, &ff, +@@ -190,7 +191,7 @@ + &PycairoMatrix_Type, &mx2)) + return NULL; + +- PyObject *o = type->tp_alloc(type, 0); ++ o = type->tp_alloc(type, 0); + if (o) { + cairo_scaled_font_t *scaled_font = cairo_scaled_font_create + (ff->font_face, &mx1->matrix, &mx2->matrix); diff --git a/graphics/py-cairo/pkg-plist b/graphics/py-cairo/pkg-plist index a4d2fac55..ffe3641ab 100644 --- a/graphics/py-cairo/pkg-plist +++ b/graphics/py-cairo/pkg-plist @@ -3,7 +3,6 @@ include/pycairo/pycairo.h %%PYTHON_SITELIBDIR%%/cairo/__init__.pyc %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo %%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%GTK%%%%PYTHON_SITELIBDIR%%/cairo/gtk.so %%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.so libdata/pkgconfig/pycairo.pc @dirrm %%PYTHON_SITELIBDIR%%/cairo |