diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-03 13:16:32 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-03 13:16:32 +0800 |
commit | 1545a8728eccc30ca1d6c373b62280a16f3a8630 (patch) | |
tree | 3838182a2f3927f39e4601b941c5a5e32d6f176a /graphics | |
parent | ecea0c0a4e9baf5e348561c16f9f5aa7725632a2 (diff) | |
download | marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar.gz marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar.bz2 marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar.lz marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar.xz marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.tar.zst marcuscom-ports-1545a8728eccc30ca1d6c373b62280a16f3a8630.zip |
Update to 0.6.0 and fix the libsvg-cairo plist.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4377 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/py-cairo/Makefile | 9 | ||||
-rw-r--r-- | graphics/py-cairo/distinfo | 4 | ||||
-rw-r--r-- | graphics/py-cairo/files/patch-cairo_pycairo-font.c | 28 | ||||
-rw-r--r-- | graphics/py-cairo/files/patch-cairo_pycairo-surface.c | 15 |
4 files changed, 14 insertions, 42 deletions
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index b9b44ad7e..303dfbf55 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,14 +3,13 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-cairo/Makefile,v 1.9 2005/07/28 22:49:31 ahze Exp $ +# $MCom: ports/graphics/py-cairo/Makefile,v 1.10 2005/07/29 02:42:54 ahze Exp $ # PORTNAME= cairo -PORTVERSION= 0.5.1.1 +PORTVERSION= 0.6.0 CATEGORIES= graphics python -MASTER_SITES= http://cairographics.org/snapshots/ \ - http://people.freebsd.org/~ahze/distfiles/ +MASTER_SITES= http://cairographics.org/snapshots/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= py${PORTNAME}-${PORTVERSION} @@ -33,7 +32,7 @@ CONFIGURE_ARGS= --without-pygtk .if defined(WITHOUT_SVG) && !exists(${LOCALBASE}/lib/libsvg-cairo.a) PLIST_SUB+= SVG="@comment " .else -PLIST_SUB+= SVG="@comment " +PLIST_SUB+= SVG="" LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo .endif diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo index b3a7a4e5f..c8dc72ce7 100644 --- a/graphics/py-cairo/distinfo +++ b/graphics/py-cairo/distinfo @@ -1,2 +1,2 @@ -MD5 (pycairo-0.5.1.1.tar.gz) = 515f9804450c6cbf6a600b535972f94a -SIZE (pycairo-0.5.1.1.tar.gz) = 834452 +MD5 (pycairo-0.6.0.tar.gz) = b20c825f0652d6960ab216b0ae1afe91 +SIZE (pycairo-0.6.0.tar.gz) = 465835 diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c index 6fc527244..ca7321d6f 100644 --- a/graphics/py-cairo/files/patch-cairo_pycairo-font.c +++ b/graphics/py-cairo/files/patch-cairo_pycairo-font.c @@ -1,31 +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 @@ - { +--- cairo/pycairo-font.c.orig Mon Aug 1 05:31:41 2005 ++++ cairo/pycairo-font.c Wed Aug 3 01:09:38 2005 +@@ -196,6 +196,7 @@ scaled_font_new (PyTypeObject *type, PyO PycairoFontFace *ff; + PycairoFontOptions *fo; PycairoMatrix *mx1, *mx2; + PyObject *o; - if (!PyArg_ParseTuple(args, "O!O!O!:ScaledFont.__init__", + if (!PyArg_ParseTuple(args, "O!O!O!O!:ScaledFont.__new__", &PycairoFontFace_Type, &ff, -@@ -190,7 +191,7 @@ - &PycairoMatrix_Type, &mx2)) +@@ -204,7 +205,7 @@ scaled_font_new (PyTypeObject *type, PyO + &PycairoFontOptions_Type, &fo)) 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); -@@ -211,8 +210,9 @@ - scaled_font_extents (PycairoScaledFont *o) - { - cairo_font_extents_t e; -- cairo_status_t status = cairo_scaled_font_extents (o->scaled_font, &e); -- if (Pycairo_Check_Status (status)) -+ -+ cairo_scaled_font_extents (o->scaled_font, &e); -+ if (Pycairo_Check_Status (cairo_scaled_font_status(o->scaled_font))) - return NULL; - return Py_BuildValue ("(ddddd)", e.ascent, e.descent, e.height, - e.max_x_advance, e.max_y_advance); + (ff->font_face, &mx1->matrix, &mx2->matrix, fo->font_options); diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-surface.c b/graphics/py-cairo/files/patch-cairo_pycairo-surface.c deleted file mode 100644 index f49e0a23d..000000000 --- a/graphics/py-cairo/files/patch-cairo_pycairo-surface.c +++ /dev/null @@ -1,15 +0,0 @@ ---- /usr/obj/usr/ports/graphics/py-cairo/work/pycairo-0.5.1.1/cairo/pycairo-surface.c Mon Jul 25 13:10:39 2005 -+++ cairo/pycairo-surface.c Sat Jul 30 17:17:21 2005 -@@ -126,10 +126,10 @@ - static PyObject * - surface_finish (PycairoSurface *o) - { -- cairo_status_t status = cairo_surface_finish (o->surface); -+ cairo_surface_finish (o->surface); - Py_CLEAR(o->base); - -- if (Pycairo_Check_Status (status)) -+ if (Pycairo_Check_Status (cairo_surface_status(o->surface))) - return NULL; - Py_RETURN_NONE; - } |