summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2019-11-08 10:54:27 +0100
committerGitHub <noreply@github.com>2019-11-08 10:54:27 +0100
commit0f3635dc8fac240b5e6d2a74d8894d83176bc357 (patch)
tree91f42e5b7b611e259ae8fb63f84e201032e56382 /gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch
parent8bb208397d2574ffcad436d23d3e8b87b3413141 (diff)
parent5f80c286cf845cbc1dde8b7d6ea177ddd4f8f39b (diff)
downloadUXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar
UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.gz
UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.lz
UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.xz
UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.zip
Merge pull request #1276 from MoonchildProductions/cairo-work
Update the in-tree cairo code.
Diffstat (limited to 'gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch')
-rw-r--r--gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch19
1 files changed, 0 insertions, 19 deletions
diff --git a/gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch b/gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch
deleted file mode 100644
index 0e7c0b973..000000000
--- a/gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# Parent 5479a346b95b82162c72419a95cbb4022cbbfe4d
-# User Ed Morley <bmo@edmorley.co.uk>
-Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'; r=jrmuizel
-
-diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
---- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
-+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
-@@ -712,9 +712,10 @@ _cairo_surface_wrapper_fini (cairo_surfa
- }
-
- cairo_status_t
- _cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper)
- {
- if (wrapper->target->backend->flush) {
- return wrapper->target->backend->flush(wrapper->target);
- }
-+ return CAIRO_STATUS_SUCCESS;
- }