OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Feb-2005 21:52:16
Branch: HEAD Handle: 2005020420521600
Added files:
openpkg-src/cairo cairo.patch
Modified files:
openpkg-src/cairo cairo.spec
Log:
add support for C++
Summary:
Revision Changes Path
1.1 +145 -0 openpkg-src/cairo/cairo.patch
1.2 +2 -0 openpkg-src/cairo/cairo.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.patch
============================================================================
$ cvs diff -u -r0 -r1.1 cairo.patch
--- /dev/null 2005-02-04 21:52:16 +0100
+++ cairo.patch 2005-02-04 21:52:16 +0100
@@ -0,0 +1,145 @@
+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 */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 cairo.spec
--- openpkg-src/cairo/cairo.spec 4 Feb 2005 17:52:39 -0000 1.1
+++ openpkg-src/cairo/cairo.spec 4 Feb 2005 20:52:16 -0000 1.2
@@ -44,6 +44,7 @@
# list of sources
Source0: http://cairographics.org/snapshots/cairo-%{version}.tar.gz
+Patch0: cairo.patch
# build information
Prefix: %{l_prefix}
@@ -88,6 +89,7 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
