diff options
| -rw-r--r-- | abs/core/cairo/PKGBUILD | 19 | ||||
| -rw-r--r-- | abs/core/cairo/git_fixes.diff | 34 |
2 files changed, 5 insertions, 48 deletions
diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD index 94177ea..d0f8353 100644 --- a/abs/core/cairo/PKGBUILD +++ b/abs/core/cairo/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.14.0 -pkgrel=2 +pkgver=1.14.6 +pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -16,17 +16,8 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' #optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') -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 -} +source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz) +sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5') build() { cd $pkgname-$pkgver @@ -42,7 +33,7 @@ build() { --enable-ps \ --enable-pdf \ --enable-gobject \ - --enable-gtk-doc + --enable-gtk-doc #--disable-xlib-xcb \ #--enable-test-surfaces \ takes ages diff --git a/abs/core/cairo/git_fixes.diff b/abs/core/cairo/git_fixes.diff deleted file mode 100644 index 8f751ce..0000000 --- a/abs/core/cairo/git_fixes.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 -From: Massimo Valentini <mvalentini@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@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 - - |