From 63d03275eb8dc796a62ac214e15b97db6393c94c403056c83ecc3d1547d53178 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Mar 2015 08:49:45 +0000 Subject: [PATCH] Accepting request 290782 from home:FunkyM:branches:GNOME:Factory Fixes crashes in various GNOME apps (like baobab and general cairo consumers) due to a bug of 1.14.0. OBS-URL: https://build.opensuse.org/request/show/290782 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=91 --- cairo-1.14.0.tar.xz | 3 -- cairo-1.14.2.tar.xz | 3 ++ cairo-tor-scan-convertor.patch | 34 ----------------------- cairo.changes | 50 ++++++++++++++++++++++++++++++++++ cairo.spec | 7 ++--- 5 files changed, 55 insertions(+), 42 deletions(-) delete mode 100644 cairo-1.14.0.tar.xz create mode 100644 cairo-1.14.2.tar.xz delete mode 100644 cairo-tor-scan-convertor.patch diff --git a/cairo-1.14.0.tar.xz b/cairo-1.14.0.tar.xz deleted file mode 100644 index f2ba6c0..0000000 --- a/cairo-1.14.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 -size 36584076 diff --git a/cairo-1.14.2.tar.xz b/cairo-1.14.2.tar.xz new file mode 100644 index 0000000..ccf30a6 --- /dev/null +++ b/cairo-1.14.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb +size 35376404 diff --git a/cairo-tor-scan-convertor.patch b/cairo-tor-scan-convertor.patch deleted file mode 100644 index ecdf5ef..0000000 --- a/cairo-tor-scan-convertor.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 -From: Massimo Valentini -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 - -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 - - diff --git a/cairo.changes b/cairo.changes index 7c7c4d6..07fc72c 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Sat Mar 14 12:30:22 UTC 2015 - opensuse@mirell.de + +- Update to version 1.14.2: + + Features: + - Improve xcb's handling of per-screen subpixel ordering. If + no Xft.rgba property is specified, default to the screen's + subpixel order. + + Performance Optimizations: + - Improve performance of cpu_to_be32 and be32_to_cpu, making + truetype subsetting of large fonts run about 15% faster. + + Bug fixes: + - Fix unaligned access on sparc with the compact font format + (CFF). + Unlike truetype, all data in CFF is not aligned. + (Debian bug #712836) + - Fix unaligned access on sparc with tor-scan-converter's + memory pool. + - Fix crash when loading a PDF with a transformed image. + (fdo bug #85151) + - Fix regression on mingw for bigendian test due to removal of + file extension for executables. (fdo bug #85120) + - Fix handling of backslash in PDF interpreter (fdo bug #85662) + - Fix crash in xlib and xcb renderers when swapping a 0-sized + glyph + - Fix bug with RTL text in PDF operators (fdo bug #86461) + - Fix compilation 'cairo-path-stroke-traps.c' with MSVC8 + (fdo bug #84908) + - Fix crash in _fill_xrgb32_lerp_opaque_spans when a span + length is negative. + - Fix valgrind error by releasing pattern created by + cairo_pattern_create_rgb(). + - Fix valgrind errors when running cairo-test-suite. + - Fix memory leak in recording surface replays (fdo bug #87898) + - Fix destruction of fonts in api-special-cases test. + (fdo bug #87567) + - Fix duplicated surface push on similar-image, preventing + trivial GTK3 program traces from being replayable, with an + error message about invalid values for the size of the input. + (fdo bug #73580) + - Fix crash when win32 surface's image size does not cover the + entire + surface. (fdo bug #53121) + - Fix crash due to obsolete CGFontGetGlyphPath call + (fdo bug #84324) + - Fix several build issues on AIX (fdo bugs #89338, #89340, + #89356, #89354) + - Fix various documentation warnings and errors +- Remove cairo-tor-scan-convertor.patch. It was upstreamed. + ------------------------------------------------------------------- Fri Jan 9 13:50:03 UTC 2015 - tchvatal@suse.com diff --git a/cairo.spec b/cairo.spec index 4f4655f..c3e3b5b 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,7 +1,7 @@ # # spec file for package cairo # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define build_xcb_backend 1 %define build_gl_backend 1 Name: cairo -Version: 1.14.0 +Version: 1.14.2 Release: 0 Summary: Vector Graphics Library with Cross-Device Output Support License: LGPL-2.1+ or MPL-1.1 @@ -35,8 +35,6 @@ Patch1: cairo-disable-lto.patch Patch2: cairo-render-thin-lines.patch # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 fcrozat@suse.com -- Fix crash when client and server have different endianness Patch3: cairo-xlib-endianness.patch -# PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 dimstar@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection in row + 0.5subrow -Patch4: cairo-tor-scan-convertor.patch BuildRequires: gtk-doc # Needed by patch0 BuildRequires: libtool @@ -151,7 +149,6 @@ cairo. # fix_for_fdo77298.patch %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build # Needed by patch0 and patch1