mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
64df3d06dc
When we did the major cairo update in bug 739096, most of our old patch files were superseded and no longer relevant, but I failed to clean them up at the time. So here, we remove all the old patch files, and create new ones just for the fixes we've applied on top of the new code from upstream. I've omitted patch files for fixes that I am aware have already landed upstream, as those will automatically be included in any future update we take. (It's possible more of the new patch files will also be obsolete by the time we try pulling a new version, but at least they should provide a starting point.) Differential Revision: https://phabricator.services.mozilla.com/D164680
23 lines
750 B
Diff
23 lines
750 B
Diff
diff --git a/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h b/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
|
|
--- a/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
|
|
+++ b/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
|
|
@@ -96,6 +96,10 @@
|
|
#define PictOpBlendMaximum 0x3e
|
|
#endif
|
|
|
|
+/* The mozilla build doesn't set up all the following HAVE_* symbols,
|
|
+ so we cheat by just checking the version number for now. */
|
|
+#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
|
|
+
|
|
#if !HAVE_XRENDERCREATESOLIDFILL
|
|
#define XRenderCreateSolidFill _int_consume
|
|
#endif
|
|
@@ -132,6 +136,7 @@ typedef struct _XConicalGradient {
|
|
} XConicalGradient;
|
|
#endif
|
|
|
|
+#endif /* RENDER_MAJOR == 0 && RENDER_MINOR < 10 */
|
|
|
|
#else /* !CAIRO_HAS_XLIB_XRENDER_SURFACE */
|
|
|