Attachment 952221 Details for Bug 1152451 – Update to 1.14.0

[patch] Update to 1.14.0

0001-Update-to-1.14.0.patch (text/plain), 4.59 KB, created by Michael Kuhn on 2014-10-30 15:32:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-10-30 15:32:17 UTC

Size: 4.59 KB

patch

obsolete

>From 4c0b1ec80621fb911e6360159a29a952ac6d9810 Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Sun, 26 Oct 2014 00:40:44 +0200
>Subject: [PATCH] Update to 1.14.0.
>
>---
> .gitignore                                         |  1 +
> ...nverter-can-t-do_fullrow-when-intersectio.patch | 36 ++++++++++++++++++++++
> cairo.spec                                         | 20 ++++++++----
> sources                                            |  2 +-
> 4 files changed, 52 insertions(+), 7 deletions(-)
> create mode 100644 0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch
>
>diff --git a/.gitignore b/.gitignore
>index 96c3632..858c2c5 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -11,3 +11,4 @@ cairo-1.9.14.tar.gz
> /cairo-1.12.14.tar.xz
> /cairo-1.12.16.tar.xz
> /cairo-1.13.1-337ab1f.tar.xz
>+/cairo-1.14.0.tar.xz
>diff --git a/0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch b/0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch
>new file mode 100644
>index 0000000..f97b2aa
>--- /dev/null
>+++ b/0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch
>@@ -0,0 +1,36 @@
>+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: [PATCH 08/12] 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>
>+---
>+ src/cairo-tor-scan-converter.c | 4 ++--
>+ 1 file changed, 2 insertions(+), 2 deletions(-)
>+
>+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;
>+-- 
>+2.1.2
>+
>diff --git a/cairo.spec b/cairo.spec
>index 24784a1..ea5522c 100644
>--- a/cairo.spec
>+++ b/cairo.spec
>@@ -1,29 +1,32 @@
>-%define pixman_version 0.18.4
>+%define pixman_version 0.30.0
> %define freetype_version 2.1.9
> %define fontconfig_version 2.2.95
> 
>-%define shortcommit 337ab1f
>+#define shortcommit 337ab1f
> 
> Summary:	A 2D graphics library
> Name:		cairo
>-Version:	1.13.1
>-Release:	0.5.git%{shortcommit}%{?dist}
>+Version:	1.14.0
>+Release:	1%{?dist}
> URL:		http://cairographics.org
> #VCS:		git:git://git.freedesktop.org/git/cairo
> #Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
>-#Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.xz
>+Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.xz
> 
> # git clone git://anongit.freedesktop.org/git/cairo
> # ./autogen.sh --enable-gtk-doc --enable-test-surfaces --enable-full-testing
> # make -j4
> # make dist
> # mv cairo-1.13.1.tar.xz cairo-1.13.1-`git rev-parse --short HEAD`.tar.xz
>-Source0:	%{name}-%{version}-%{shortcommit}.tar.xz
>+#Source0:	%{name}-%{version}-%{shortcommit}.tar.xz
>+
> License:	LGPLv2 or MPLv1.1
> Group:		System Environment/Libraries
> 
> Patch0:		0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch
> Patch1:		0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch
>+# https://bugs.freedesktop.org/show_bug.cgi?id=85151
>+Patch2:         0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch
> Patch3:         cairo-multilib.patch
> 
> BuildRequires: pkgconfig
>@@ -101,6 +104,7 @@ This package contains tools for working with the cairo graphics library.
> %setup -q
> %patch0 -p1 -b .xlib-swap
> %patch1 -p1 -b .xcb-swap
>+%patch2 -p1 -b .fdo-85151
> %patch3 -p1 -b .multilib
> 
> %build
>@@ -187,6 +191,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
> %{_libdir}/cairo/
> 
> %changelog
>+* Thu Oct 30 2014 Michael Kuhn <suraia@ikkoku.de> - 1.14.0-1
>+- Update to 1.14.0.
>+- Add patch to fix crash with certain PDF files.
>+
> * Tue Oct 14 2014 Kalev Lember <kalevlember@gmail.com> - 1.13.1-0.5.git337ab1f
> - Minor spec file cleanup:
> - Drop manual -devel subpackage deps
>diff --git a/sources b/sources
>index c5c0ca7..51a7883 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-f44d8e5c7e57b1b47968747817e7e11c  cairo-1.13.1-337ab1f.tar.xz
>+fc3a5edeba703f906f2241b394f0cced  cairo-1.14.0.tar.xz
>-- 
>2.1.2
>

Actions: View | Diff

Attachments on bug 1152451: 952221 | 972189