diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-08 02:31:31 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-05-08 02:31:31 +0000 |
| commit | 2d5ad5d44e81162edd80ef684cd3b13d21f2bac6 (patch) | |
| tree | d7472214420262ab720d8004b5ac5f2bc738d68e /x11-libs | |
| parent | Revision bump, replace broken ebuild that defined src_prepare twice and (diff) | |
| download | gentoo-2-2d5ad5d44e81162edd80ef684cd3b13d21f2bac6.tar.gz gentoo-2-2d5ad5d44e81162edd80ef684cd3b13d21f2bac6.tar.bz2 gentoo-2-2d5ad5d44e81162edd80ef684cd3b13d21f2bac6.zip | |
Patch applied upstream, thanks to Yannick Schaeffer (bug #509770).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch | 17 |
3 files changed, 15 insertions, 13 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index 8e38df845cc5..fa05ae62a42f 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.377 2014/05/04 17:51:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.378 2014/05/08 02:31:31 tetromino Exp $ + + 08 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-9999.ebuild, + files/cairo-1.12.16-all-clipped-3.patch: + Patch applied upstream, thanks to Yannick Schaeffer (bug #509770). 04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-1.12.16-r3.ebuild, cairo-9999.ebuild: diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 216ccce6b777..65880ff6d4b5 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.43 2014/05/04 17:51:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.44 2014/05/08 02:31:30 tetromino Exp $ EAPI=5 @@ -106,9 +106,6 @@ src_prepare() { use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch - # bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931 - epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch - # allow the automagically injected -flto flag to be not injected epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch diff --git a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch index 98cd4d503d67..8b796faaf554 100644 --- a/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch +++ b/x11-libs/cairo/files/cairo-1.12.16-all-clipped-3.patch @@ -1,16 +1,17 @@ -From 180fead4390089e56c28dba0fcfaa99d127722c1 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu May 1 23:39:01 PDT 2014 -Subject: [PATCH] segfault in cairo-xcb-surface-render.c +From 18b3cce2f5812c357e4b6310e72d72dd9ec92ed4 Mon Sep 17 00:00:00 2001 +From: Bryce Harrington <b.harrington@samsung.com> +Date: Tue, 6 May 2014 10:18:19 -0700 +Subject: [PATCH] Fix segfault in firefox when scrolling on certain pages -http://lists.cairographics.org/archives/cairo/2014-May/025197.html -https://bugs.freedesktop.org/show_bug.cgi?id=77931 +Bug discovered by thorsten <fly_a320@gmx.de> + +Patch from Chris Wilson <chris@chris-wilson.co.uk> --- src/cairo-xcb-surface-render.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c -index 9625953..54307d5 100644 +index 9625953..75455e5 100644 --- a/src/cairo-xcb-surface-render.c +++ b/src/cairo-xcb-surface-render.c @@ -3121,6 +3121,9 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst, @@ -18,7 +19,7 @@ index 9625953..54307d5 100644 clip = _cairo_clip_copy (extents->clip); clip = _cairo_clip_intersect_boxes (clip, boxes); + if (_cairo_clip_is_all_clipped (clip)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; ++ return CAIRO_INT_STATUS_NOTHING_TO_DO; + status = _cairo_clip_get_polygon (clip, &polygon, &fill_rule, &antialias); |