[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.diff)
Andreas Radke
andyrtr at archlinux.org
Wed Oct 29 14:52:43 UTC 2014
Date: Wednesday, October 29, 2014 @ 15:52:43
Author: andyrtr
Revision: 225432
upgpkg: cairo 1.14.0-2
fix a segfault; FS#42596
Added:
cairo/trunk/git_fixes.diff
Modified:
cairo/trunk/PKGBUILD
----------------+
PKGBUILD | 15 ++++++++++++---
git_fixes.diff | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-29 14:09:55 UTC (rev 225431)
+++ PKGBUILD 2014-10-29 14:52:43 UTC (rev 225432)
@@ -4,7 +4,7 @@
pkgname=cairo
pkgver=1.14.0
-pkgrel=1
+pkgrel=2
pkgdesc="Cairo vector graphics library"
arch=(i686 x86_64)
license=('LGPL' 'MPL')
@@ -16,9 +16,18 @@
#optdepends=('xcb-util: for XCB backend') # really needed?
provides=('cairo-xcb')
replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
+ git_fixes.diff)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
+ '0ebac538dfa510e8e3f07ba71a49dabc627b08ff')
+prepare() {
+ cd $pkgname-$pkgver
+ # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+ # https://bugs.archlinux.org/task/42596
+ patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr \
Added: git_fixes.diff
===================================================================
--- git_fixes.diff (rev 0)
+++ git_fixes.diff 2014-10-29 14:52:43 UTC (rev 225432)
@@ -0,0 +1,34 @@
+From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini <mvalentini at src.gnome.org>
+Date: Sun, 19 Oct 2014 09:19:10 +0200
+Subject: tor-scan-converter: can't do_fullrow when intersection in row +
+ 0.5subrow
+
+the active edges list must be left sorted at the next possible use
+and since full_row does not deal with intersections it is not usable
+when there is an intersection in the top half of the next row first
+subrow
+
+Reported-and-tested-by: Matthew Leach
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
+
+diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
+index 4adcafb..14922d0 100644
+--- a/src/cairo-tor-scan-converter.c
++++ b/src/cairo-tor-scan-converter.c
+@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
+
+ if (e->dy) {
+ struct quorem x = e->x;
+- x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
+- x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
++ x.quo += e->dxdy_full.quo;
++ x.rem += e->dxdy_full.rem;
+ if (x.rem < 0) {
+ x.quo--;
+ x.rem += e->dy;
+--
+cgit v0.10.2
+
+
More information about the arch-commits
mailing list