[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.diff)

[Andreas Radke]

    Date: Wednesday, March 11, 2015 @ 19:52:24
  Author: andyrtr
Revision: 233362

upgpkg: cairo 1.14.2-1

upstream update 1.14.2

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/git_fixes.diff

----------------+
 PKGBUILD       |   17 ++++-------------
 git_fixes.diff |   34 ----------------------------------
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-11 18:17:35 UTC (rev 233361)
+++ PKGBUILD	2015-03-11 18:52:24 UTC (rev 233362)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=cairo
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.14.2
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,18 +16,9 @@
 #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')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
+sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24')
 
-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 \

Deleted: git_fixes.diff
===================================================================
--- git_fixes.diff	2015-03-11 18:17:35 UTC (rev 233361)
+++ git_fixes.diff	2015-03-11 18:52:24 UTC (rev 233362)
@@ -1,34 +0,0 @@
-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
-
-