summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/fix-clip-copy.patch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-06 21:06:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-07 14:49:48 +0100
commit7efd71616ec5efedbe626a986a707c35d3cac323 (patch)
tree0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/fix-clip-copy.patch
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible other licensing has been retained where originally present. - Remove individual superseded licensing terms. - Remove patches, outdated readmes & incomplete patch summaries. - Remove incomplete cairo release notes (only went up to 1.6.4 anyway). - Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/fix-clip-copy.patch')
-rw-r--r--gfx/cairo/fix-clip-copy.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/gfx/cairo/fix-clip-copy.patch b/gfx/cairo/fix-clip-copy.patch
deleted file mode 100644
index c2c3b2fc8..000000000
--- a/gfx/cairo/fix-clip-copy.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit f49a9740350d2f0d69ed59e913f0263a899cfb2a
-Author: Jeff Muizelaar <jmuizelaar@mozilla.com>
-Date: Fri Jan 29 14:39:24 2010 -0500
-
- Fix clip copy
-
-diff --git a/src/cairo-clip.c b/src/cairo-clip.c
-index 8d66a5f..6acbcff 100644
---- a/src/cairo-clip.c
-+++ b/src/cairo-clip.c
-@@ -280,13 +280,12 @@ cairo_clip_t *
- _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other)
- {
- if (other != NULL) {
-- if (other->path == NULL) {
-- _cairo_clip_init (clip);
-- clip = NULL;
-- } else {
-- clip->all_clipped = other->all_clipped;
-- clip->path = _cairo_clip_path_reference (other->path);
-- }
-+ clip->all_clipped = other->all_clipped;
-+ clip->path = _cairo_clip_path_reference (other->path);
-+
-+ /* this guy is here because of the weird return semantics of _cairo_clip_init_copy */
-+ if (!other->path)
-+ return NULL;
- } else {
- _cairo_clip_init (clip);
- }