please test/comment/ok. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/cairo/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 21 May 2007 12:35:33 -0000 1.13 +++ Makefile 8 Jul 2007 12:38:15 -0000 @@ -2,8 +2,8 @@ COMMENT= "vector graphics library" -DISTNAME= cairo-1.4.6 -SHARED_LIBS += cairo 6.1 # .11.3 +DISTNAME= cairo-1.4.10 +SHARED_LIBS += cairo 7.0 # .13.5 CATEGORIES= graphics HOMEPAGE= http://cairographics.org/introduction Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/cairo/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 21 May 2007 12:35:33 -0000 1.7 +++ distinfo 8 Jul 2007 12:38:15 -0000 @@ -1,5 +1,5 @@ -MD5 (cairo-1.4.6.tar.gz) = rhbnP53KRqyTtM5DXpN3PA== -RMD160 (cairo-1.4.6.tar.gz) = FEulQixBQHDOtpHc1Z+oh/gml7E= -SHA1 (cairo-1.4.6.tar.gz) = v9FTLhB4n8T4ehllQMBJ2IxuzkI= -SHA256 (cairo-1.4.6.tar.gz) = ymMq/LSs3lU0Y8BoLAYFODdi6RdPgECqmX1xWv89iJY= -SIZE (cairo-1.4.6.tar.gz) = 3181592 +MD5 (cairo-1.4.10.tar.gz) = VZil5QCtki43sVne5y/Jkw== +RMD160 (cairo-1.4.10.tar.gz) = zhywJdR+w5VXfk9Mb+UJK+heDL4= +SHA1 (cairo-1.4.10.tar.gz) = g3EJfjBlDsgXskaUNnEQE5YnQD4= +SHA256 (cairo-1.4.10.tar.gz) = WU54pmBEiYwyHjeNR/r0O2ZbI7pjiDTSeH40S6E+UTI= +SIZE (cairo-1.4.10.tar.gz) = 3216689 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-configure,v retrieving revision 1.5 diff -u -r1.5 patch-configure --- patches/patch-configure 21 May 2007 12:35:33 -0000 1.5 +++ patches/patch-configure 8 Jul 2007 12:38:15 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.5 2007/05/21 12:35:33 steven Exp $ ---- configure.orig Tue May 1 22:25:17 2007 -+++ configure Sat May 5 16:09:43 2007 -@@ -25884,7 +25884,7 @@ else +--- configure.orig Wed Jun 27 23:06:23 2007 ++++ configure Sun Jul 8 12:20:08 2007 +@@ -25885,7 +25885,7 @@ else if test "x$png_REQUIRES" = x; then # libpng13 is GnuWin32's libpng-1.2.8 :-( @@ -10,7 +10,7 @@ if $PKG_CONFIG --exists $l ; then png_REQUIRES=$l use_png=yes -@@ -29667,7 +29667,7 @@ fi +@@ -29738,7 +29738,7 @@ fi case `$PKG_CONFIG --version` in 0.?|0.?.?|0.1[0-7]|0.1[0-7].?) PKGCONFIG_REQUIRES="Requires"; ;; Index: patches/patch-src_cairo-xlib-surface-private_h =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo-xlib-surface-private_h,v retrieving revision 1.1 diff -u -r1.1 patch-src_cairo-xlib-surface-private_h --- patches/patch-src_cairo-xlib-surface-private_h 21 May 2007 12:35:33 -0000 1.1 +++ patches/patch-src_cairo-xlib-surface-private_h 8 Jul 2007 12:38:15 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_cairo-xlib-surface-private_h,v 1.1 2007/05/21 12:35:33 steven Exp $ ---- src/cairo-xlib-surface-private.h.orig Sat May 5 16:10:26 2007 -+++ src/cairo-xlib-surface-private.h Sat May 5 16:10:51 2007 +--- src/cairo-xlib-surface-private.h.orig Wed May 9 15:37:39 2007 ++++ src/cairo-xlib-surface-private.h Sun Jul 8 12:20:08 2007 @@ -39,6 +39,8 @@ typedef struct _cairo_xlib_surface cairo_xlib_surface_t; @@ -10,7 +10,7 @@ struct _cairo_xlib_surface { cairo_surface_t base; -@@ -88,6 +90,9 @@ struct _cairo_xlib_surface { +@@ -89,6 +91,9 @@ struct _cairo_xlib_surface { cairo_filter_t filter; int repeat; XTransform xtransform; @@ -19,4 +19,4 @@ + int workaround; }; - #endif /* CAIRO_XLIB_SURFACE_PRIVATE_H */ + enum { Index: patches/patch-src_cairo-xlib-surface_c =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo-xlib-surface_c,v retrieving revision 1.5 diff -u -r1.5 patch-src_cairo-xlib-surface_c --- patches/patch-src_cairo-xlib-surface_c 21 May 2007 12:35:33 -0000 1.5 +++ patches/patch-src_cairo-xlib-surface_c 8 Jul 2007 12:38:15 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_cairo-xlib-surface_c,v 1.5 2007/05/21 12:35:33 steven Exp $ ---- src/cairo-xlib-surface.c.orig Tue May 1 19:39:47 2007 -+++ src/cairo-xlib-surface.c Sat May 5 18:47:44 2007 -@@ -446,6 +446,255 @@ _swap_ximage_to_native (XImage *ximage) +--- src/cairo-xlib-surface.c.orig Wed Jun 27 20:05:33 2007 ++++ src/cairo-xlib-surface.c Sun Jul 8 12:20:08 2007 +@@ -494,6 +494,255 @@ _swap_ximage_to_native (XImage *ximage) } } @@ -257,7 +257,7 @@ static cairo_status_t _get_image_surface (cairo_xlib_surface_t *surface, cairo_rectangle_int16_t *interest_rect, -@@ -604,9 +853,14 @@ _get_image_surface (cairo_xlib_surface_t *surface, +@@ -652,9 +901,14 @@ _get_image_surface (cairo_xlib_surface_t *surface, ximage->bytes_per_line); if (image->base.status) goto FAIL; @@ -272,7 +272,7 @@ /* * XXX This can't work. We must convert the data to one of the * supported pixman formats. Pixman needs another function -@@ -621,6 +875,98 @@ _get_image_surface (cairo_xlib_surface_t *surface, +@@ -669,6 +923,98 @@ _get_image_surface (cairo_xlib_surface_t *surface, ximage->bytes_per_line); if (image->base.status) goto FAIL; @@ -371,7 +371,7 @@ } /* Let the surface take ownership of the data */ -@@ -698,6 +1044,30 @@ _cairo_xlib_surface_ensure_gc (cairo_xlib_surface_t *s +@@ -770,6 +1116,30 @@ _cairo_xlib_surface_ensure_gc (cairo_xlib_surface_t *s return CAIRO_STATUS_SUCCESS; } @@ -402,7 +402,7 @@ static cairo_status_t _draw_image_surface (cairo_xlib_surface_t *surface, cairo_image_surface_t *image, -@@ -713,19 +1083,98 @@ _draw_image_surface (cairo_xlib_surface_t *surface, +@@ -785,19 +1155,98 @@ _draw_image_surface (cairo_xlib_surface_t *surface, int native_byte_order = _native_byte_order_lsb () ? LSBFirst : MSBFirst; cairo_status_t status; @@ -504,7 +504,7 @@ ximage.bits_per_pixel = bpp; ximage.red_mask = red; ximage.green_mask = green; -@@ -1793,6 +2242,7 @@ _cairo_xlib_surface_create_internal (Display * +@@ -1945,6 +2394,7 @@ _cairo_xlib_surface_create_internal (Display * int height, int depth) { @@ -512,7 +512,7 @@ cairo_xlib_surface_t *surface; cairo_xlib_screen_info_t *screen_info; -@@ -1885,7 +2335,38 @@ _cairo_xlib_surface_create_internal (Display * +@@ -2042,7 +2492,38 @@ _cairo_xlib_surface_create_internal (Display * surface->have_clip_rects = FALSE; surface->clip_rects = surface->embedded_clip_rects; surface->num_clip_rects = 0; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 21 May 2007 12:35:33 -0000 1.3 +++ pkg/PLIST 8 Jul 2007 12:38:15 -0000 @@ -64,11 +64,11 @@ share/gtk-doc/html/cairo/cairo.devhelp share/gtk-doc/html/cairo/cairo.devhelp2 share/gtk-doc/html/cairo/home.png +share/gtk-doc/html/cairo/index-1.2.html +share/gtk-doc/html/cairo/index-1.4.html share/gtk-doc/html/cairo/index.html share/gtk-doc/html/cairo/index.sgml share/gtk-doc/html/cairo/ix01.html -share/gtk-doc/html/cairo/ix02.html -share/gtk-doc/html/cairo/ix03.html share/gtk-doc/html/cairo/language-bindings.html share/gtk-doc/html/cairo/left.png share/gtk-doc/html/cairo/pt01.html
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
