[cairo-commit] 2 commits - src/cairo-directfb-surface.c src/cairo-quartz-image-surface.c src/cairo-quartz-surface.c src/cairo-script-surface.c src/cairo-win32-font.c src/cairo-win32-surface.c test/Makefile.am

[Andrea Canciani]

 src/cairo-directfb-surface.c     |    1 +
 src/cairo-quartz-image-surface.c |    1 +
 src/cairo-quartz-surface.c       |    4 ++++
 src/cairo-script-surface.c       |    1 +
 src/cairo-win32-font.c           |    1 +
 src/cairo-win32-surface.c        |    1 +
 test/Makefile.am                 |    2 +-
 7 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 29d19c683b99b6bc3f59e771c273a32721995887
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Jul 19 07:50:47 2011 +0200

    build: Fix compilation
    
    83bfd85a1378e61b8bdc3f554f5e07900311f61f and
    2458120dee350cd1b49f999f64b17a895a4b6607 did not update some backends
    properly, breaking their compilation.

diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index 3de0168..6117907 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -41,6 +41,7 @@
 #include "cairo-clip-private.h"
 #include "cairo-default-context-private.h"
 #include "cairo-error-private.h"
+#include "cairo-pattern-private.h"
 
 #include <pixman.h>
 
diff --git a/src/cairo-quartz-image-surface.c b/src/cairo-quartz-image-surface.c
index cd675a1..2d0058e 100644
--- a/src/cairo-quartz-image-surface.c
+++ b/src/cairo-quartz-image-surface.c
@@ -40,6 +40,7 @@
 #include "cairo-quartz-private.h"
 
 #include "cairo-error-private.h"
+#include "cairo-default-context-private.h"
 
 #define SURFACE_ERROR_NO_MEMORY (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_NO_MEMORY)))
 #define SURFACE_ERROR_TYPE_MISMATCH (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_SURFACE_TYPE_MISMATCH)))
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index 1b97aec..9628c87 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -39,7 +39,9 @@
 
 #include "cairo-quartz-private.h"
 
+#include "cairo-default-context-private.h"
 #include "cairo-error-private.h"
+#include "cairo-pattern-private.h"
 #include "cairo-surface-clipper-private.h"
 
 #include <dlfcn.h>
@@ -2417,6 +2419,8 @@ _cairo_quartz_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
 
 static const struct _cairo_surface_backend cairo_quartz_surface_backend = {
     CAIRO_SURFACE_TYPE_QUARTZ,
+    _cairo_default_context_create,
+
     _cairo_quartz_surface_create_similar,
     _cairo_quartz_surface_finish,
     _cairo_quartz_surface_acquire_source_image,
diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index 6b59464..4ca0faf 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -47,6 +47,7 @@
 #include "cairo-script.h"
 
 #include "cairo-analysis-surface-private.h"
+#include "cairo-default-context-private.h"
 #include "cairo-device-private.h"
 #include "cairo-error-private.h"
 #include "cairo-list-private.h"
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index 0aad373..67ec51d 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -46,6 +46,7 @@
 
 #include "cairo-win32-private.h"
 #include "cairo-error-private.h"
+#include "cairo-pattern-private.h"
 #include "cairo-scaled-font-subsets-private.h"
 
 #include <wchar.h>
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 24b1ba6..0f0bffc 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -52,6 +52,7 @@
 #include "cairo-default-context-private.h"
 #include "cairo-error-private.h"
 #include "cairo-paginated-private.h"
+#include "cairo-pattern-private.h"
 #include "cairo-win32-private.h"
 #include "cairo-scaled-font-subsets-private.h"
 #include "cairo-surface-fallback-private.h"
commit e5dfac245f8252a30e39f682f73a7e0065e7ffca
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Jul 19 07:26:59 2011 +0200

    build: Fix automake error
    
    b8f43617a98aeb6c10d554ed11b48a83fc9b5129 regressed the generation of
    Makefiles. automake 1.10 fails when executed during ./autogen.sh:
    
    automake: cairo_test_suite_OBJECTS should not be defined
    test/Makefile.am:76:   while processing program `cairo-test-suite'

diff --git a/test/Makefile.am b/test/Makefile.am
index f44ce06..e4e3063 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -73,7 +73,7 @@ endif
 endif
 test_sources += $(test)
 
-noinst_PROGRAMS = cairo-test-suite # always build
+noinst_PROGRAMS = cairo-test-suite$(EXEEXT) # always build
 
 TESTS += cairo-test-suite$(EXEEXT)