This is an update to cairo 1.10.2, with a patch to help it build on gcc2
archs.
Eric.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 17 Nov 2010 08:05:13 -0000 1.31
+++ Makefile 3 Jan 2011 13:02:44 -0000
@@ -2,8 +2,7 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.0
-REVISION= 0
+DISTNAME= cairo-1.10.2
SHARED_LIBS= cairo 11.0
SHARED_LIBS+= cairo-trace 0.0
SHARED_LIBS+= cairo-gobject 0.0
@@ -45,3 +44,9 @@
REGRESS_DEPENDS= print/ghostscript/gnu
.include <bsd.port.mk>
+
+.for i in ${GCC2_ARCHS}
+. if ${MACHINE_ARCH} == $i
+PATCH_LIST= patch-* gcc2-patch-*
+. endif
+.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo 11 Oct 2010 08:09:44 -0000 1.17
+++ distinfo 3 Jan 2011 13:02:44 -0000
@@ -1,5 +1,5 @@
-MD5 (cairo-1.10.0.tar.gz) = cKLs5mz0c9l24tsPdb8Zng==
-RMD160 (cairo-1.10.0.tar.gz) = +mXU85JjCIV9E/PtDBAPifB13AE=
-SHA1 (cairo-1.10.0.tar.gz) = 7+fkdAjVGIaQIozK3IUjZS9r9wI=
-SHA256 (cairo-1.10.0.tar.gz) = DyzkzEYVWUCI1064tTYLrXw8w8Pam2Gvm/2XntHtlLI=
-SIZE (cairo-1.10.0.tar.gz) = 24022822
+MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
+RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
+SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
+SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
+SIZE (cairo-1.10.2.tar.gz) = 23558405
Index: patches/gcc2-patch-src_cairo-gl-private_h
===================================================================
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/gcc2-patch-src_cairo-gl-private_h 3 Jan 2011 13:02:44 -0000
@@ -0,0 +1,21 @@
+remove unnamed union to please gcc-2.95
+
+$OpenBSD$
+--- src/cairo-gl-private.h.orig Mon Jan 3 12:23:14 2011
++++ src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
+@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
+ */
+ typedef struct cairo_gl_operand {
+ cairo_gl_operand_type_t type;
+- union {
+ struct {
+ GLuint tex;
+ cairo_gl_surface_t *surface;
+@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
+ float radius_1;
+ cairo_extend_t extend;
+ } radial;
+- };
+ unsigned int vertex_offset;
+ } cairo_gl_operand_t;
+
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Oct 2010 08:09:44 -0000 1.5
+++ patches/patch-src_Makefile_in 3 Jan 2011 13:02:44 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2010/10/11 08:09:44 eric Exp $
---- src/Makefile.in.orig Mon Sep 6 18:16:41 2010
-+++ src/Makefile.in Mon Sep 13 17:44:05 2010
-@@ -2425,7 +2425,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+--- src/Makefile.in.orig Sat Dec 25 15:22:52 2010
++++ src/Makefile.in Mon Dec 27 10:07:21 2010
+@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
) >$@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
Index: patches/patch-src_cairo_h
===================================================================
RCS file: patches/patch-src_cairo_h
diff -N patches/patch-src_cairo_h
--- patches/patch-src_cairo_h 11 Oct 2010 08:09:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_cairo_h,v 1.1 2010/10/11 08:09:44 eric Exp $
---- src/cairo.h.orig Sat Oct 9 10:54:20 2010
-+++ src/cairo.h Sat Oct 9 10:54:10 2010
-@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
- CAIRO_DEVICE_TYPE_SCRIPT,
- CAIRO_DEVICE_TYPE_XCB,
- CAIRO_DEVICE_TYPE_XLIB,
-- CAIRO_DEVICE_TYPE_XML,
-+ CAIRO_DEVICE_TYPE_XML
- } cairo_device_type_t;
-
- cairo_public cairo_device_type_t
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 17 Oct 2010 12:50:53 -0000 1.9
+++ pkg/PLIST 3 Jan 2011 13:02:44 -0000
@@ -63,6 +63,7 @@
share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
share/gtk-doc/html/cairo/cairo-Regions.html
share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
share/gtk-doc/html/cairo/cairo-Transformations.html
