From b8869eed714357230dae5b5203338cf88821e89d Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 22 Mar 2012 11:37:19 -0400 Subject: [PATCH] Bug 737909 - Add a patch file to gfx/cairo; r=joe DONTBUILD --- gfx/cairo/README | 2 ++ .../fix-build-with-Werror=return-type.patch | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 gfx/cairo/fix-build-with-Werror=return-type.patch diff --git a/gfx/cairo/README b/gfx/cairo/README index eb8428ea1270..7084610ff363 100644 --- a/gfx/cairo/README +++ b/gfx/cairo/README @@ -176,6 +176,8 @@ quartz-mark-dirty.patch: Add a quartz implementation of mark_dirty_rectangle (bu expose-snapshot.patch: Make functions to add snapshots public, as well as allow creating null surfaces publically. (bug 715658) +fix-build-with-Werror=return-type.patch: Fix builds with -Werror=return-type (bug 737909) + ==== pixman patches ==== pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv. diff --git a/gfx/cairo/fix-build-with-Werror=return-type.patch b/gfx/cairo/fix-build-with-Werror=return-type.patch new file mode 100644 index 000000000000..7cd77a597898 --- /dev/null +++ b/gfx/cairo/fix-build-with-Werror=return-type.patch @@ -0,0 +1,21 @@ +diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c +--- a/gfx/cairo/cairo/src/cairo-quartz-surface.c ++++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c +@@ -436,16 +436,17 @@ _cairo_quartz_cairo_operator_to_quartz_c + case CAIRO_OPERATOR_DIFFERENCE: + case CAIRO_OPERATOR_EXCLUSION: + case CAIRO_OPERATOR_HSL_HUE: + case CAIRO_OPERATOR_HSL_SATURATION: + case CAIRO_OPERATOR_HSL_COLOR: + case CAIRO_OPERATOR_HSL_LUMINOSITY: + default: + assert (0); ++ return kPrivateCGCompositeClear; + } + } + + static cairo_int_status_t + _cairo_quartz_surface_set_cairo_operator (cairo_quartz_surface_t *surface, cairo_operator_t op) + { + ND((stderr, "%p _cairo_quartz_surface_set_cairo_operator %d\n", surface, op)); +