downgrade to 0.4.0 (because Firefox is still not compatible with 0.5.0) and bless from EVAL to PLUS

cairo/cairo.patch

@@ -0,0 +1,186 @@
+Index: src/cairo-ft.h
+--- src/cairo-ft.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-ft.h	2005-02-04 21:49:51 +0100
+@@ -46,6 +46,10 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ cairo_font_t *
+ cairo_ft_font_create (FT_Library ft_library, FcPattern *pattern);
+ 
+@@ -58,5 +62,9 @@
+ FcPattern *
+ cairo_ft_font_pattern (cairo_font_t  *ft_font);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_FT_FONT */
+ #endif /* CAIRO_FT_H */
+Index: src/cairo-pdf.h
+--- src/cairo-pdf.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-pdf.h	2005-02-04 21:49:34 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void
+ cairo_set_target_pdf (cairo_t	*cr,
+ 		      FILE	*file,
+@@ -58,5 +62,9 @@
+ 			  double	x_pixels_per_inch,
+ 			  double	y_pixels_per_inch);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_PDF_SURFACE */
+ #endif /* CAIRO_PDF_H */
+Index: src/cairo-png.h
+--- src/cairo-png.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-png.h	2005-02-04 21:49:09 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void
+ cairo_set_target_png (cairo_t	*cr,
+ 		      FILE	*file,
+@@ -55,5 +59,9 @@
+ 			  int			width,
+ 			  int			height);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_PNG_SURFACE */
+ #endif /* CAIRO_PNG_H */
+Index: src/cairo-ps.h
+--- src/cairo-ps.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-ps.h	2005-02-04 21:49:24 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void
+ cairo_set_target_ps (cairo_t	*cr,
+ 		     FILE	*file,
+@@ -59,5 +63,9 @@
+ 			 double	x_pixels_per_inch,
+ 			 double	y_pixels_per_inch);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_PS_SURFACE */
+ #endif /* CAIRO_PS_H */
+Index: src/cairo-xcb.h
+--- src/cairo-xcb.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-xcb.h	2005-02-04 21:50:13 +0100
+@@ -43,6 +43,10 @@
+ #include <X11/XCB/xcb.h>
+ #include <X11/XCB/render.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void
+ cairo_set_target_xcb (cairo_t		*cr,
+ 		      XCBConnection	*dpy,
+@@ -50,5 +54,9 @@
+ 		      XCBVISUALTYPE	*visual,
+ 		      cairo_format_t	format);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_XCB_SURFACE */
+ #endif /* CAIRO_XCB_H */
+Index: src/cairo-xlib.h
+--- src/cairo-xlib.h.orig	2005-01-20 17:28:54 +0100
++++ src/cairo-xlib.h	2005-02-04 21:48:56 +0100
+@@ -42,6 +42,10 @@
+ 
+ #include <X11/extensions/Xrender.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* XXX: This shold be renamed to cairo_set_target_xlib to match the
+  * other backends */
+ void
+@@ -66,6 +70,10 @@
+ cairo_xlib_surface_set_size (cairo_surface_t *surface, int width, int height);
+ */
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* CAIRO_HAS_XLIB_SURFACE */
+ #endif /* CAIRO_XLIB_H */
+ 
+Index: src/cairoint.h
+--- src/cairoint.h.orig	2005-03-04 18:57:54 +0100
++++ src/cairoint.h	2005-03-30 17:39:07 +0200
+@@ -54,7 +54,16 @@
+ #include <string.h>
+ #include <math.h>
+ #include <limits.h>
+-#include <stdint.h>
++
++#if defined (__SVR4) && defined (__sun)
++# include <sys/int_types.h>
++#else
++# if defined (__OpenBSD__) || defined (__FreeBSD__)
++#  include <inttypes.h>
++# else 
++#  include <stdint.h>
++# endif
++#endif
+ 
+ #include "cairo.h"
+ 
+Index: src/cairo-wideint.h
+--- src/cairo-wideint.h.orig	2005-02-22 20:24:50 +0100
++++ src/cairo-wideint.h	2005-03-30 17:42:19 +0200
+@@ -38,7 +38,15 @@
+ #ifndef CAIRO_WIDEINT_H
+ #define CAIRO_WIDEINT_H
+ 
+-#include <stdint.h>
++#if defined (__SVR4) && defined (__sun)
++# include <sys/int_types.h>
++#else
++# if defined (__OpenBSD__) || defined (__FreeBSD__)
++#  include <inttypes.h>
++# else 
++#  include <stdint.h>
++# endif
++#endif
+ 
+ /*
+  * 64-bit datatypes.  Two separate implementations, one using

cairo/cairo.spec

@@ -29,11 +29,11 @@ URL:          http://www.cairo.org/
 Vendor:       Carl Worth & Keith Packard
 Packager:     OpenPKG
 Distribution: OpenPKG
-Class:        EVAL
+Class:        PLUS
 Group:        XWindow
 License:      MIT-style
-Version:      0.5.0
-Release:      20050526
+Version:      0.4.0
+Release:      20050615
 
 #   package options
 %option       with_pdf   yes
@@ -43,6 +43,7 @@ Release:      20050526
 
 #   list of sources
 Source0:      http://cairographics.org/snapshots/cairo-%{version}.tar.gz
+Patch0:       cairo.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -87,6 +88,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
     %{l_shtool} subst \
@@ -104,7 +106,6 @@ AutoReqProv:  no
 %if "%{with_png}" == "yes"
     LIBS="$LIBS -lpng -lz"
 %endif
-    export PKG_CONFIG="%{l_prefix}/bin/pkg-config"
     ./configure \
         --prefix=%{l_prefix} \
 %if "%{with_png}" == "yes"