Accepting request 121410 from GNOME:Factory

push G:F

OBS-URL: https://build.opensuse.org/request/show/121410
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=48

cairo-1.12.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
-size 63084508

cairo-1.12.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96
+size 42051584

cairo-fix-wrong-allocation.patch

@@ -1,29 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: cairo: Fix wrong allocation in _cairo_pdf_surface_add_source_surface
-References: bnc#758422
-
- _cairo_pdf_surface_add_source_surface allocates unique_id with
- size unique_id_length but then copies surface_key.unique_id_length into it.
-
- This causes e.g. evince to crash predictably while trying to print with:
-  *** buffer overflow detected ***: evince terminated
-
- We should be using surface_key.unique_id_length instead.
-
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
- src/cairo-pdf-surface.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -1379,7 +1379,7 @@ _cairo_pdf_surface_add_source_surface (c
- 	    goto release_source;
- 
- 	if (surface_key.unique_id && surface_key.unique_id_length > 0) {
--	    unique_id = malloc (unique_id_length);
-+	    unique_id = malloc (surface_key.unique_id_length);
- 	    if (unique_id == NULL) {
- 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 		goto release_source;
-

cairo.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Apr 29 21:09:19 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.12.2:
+  + Allow applications to create 0x0 xlib surfaces, such as used by
+    LibreOffice (fdo#49118)
+  + Trim composite extents for SOURCE/CLEAR operators to the mask.
+  + Use fallback fonts in PDF for unhandled computed glyph widths
+    (fdo#48349)
+  + Handle snapshots of recording surfaces for analysing pattern
+    extents. Fixes a regression of reporting the PDF bounding box
+    as being the page size.
+  + Fix allocation size for PDF pattern ids. (fdo#49089)
+  + Fix emission of rectilinear dashed segments, with and without
+    scaling, and application of degenerate line joins.
+  + Clamp unbounded fixup polygons to the clip extents.
+  + Prevent infinite loop due to rounding errors whilst
+    incrementing along dashes.
+  + Prevent overflow for inline a8 span filling.
+  + Miscellaneous build fixes for Cygwin on Windows and Solaris.
+- Drop cairo-fix-wrong-allocation.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Sat Apr 21 15:34:36 UTC 2012 - jeffm@suse.com
 

cairo.spec

@@ -20,18 +20,16 @@
 %define build_gl_backend 0
 
 Name:           cairo
-Version:        1.12.0
+Version:        1.12.2
 Release:        0
 Summary:        Vector Graphics Library with Cross-Device Output Support
 License:        LGPL-2.1+ or MPL-1.1
 Group:          System/Libraries
 Url:            http://cairographics.org/
-Source:         http://cairographics.org/releases/%{name}-%{version}.tar.gz
+Source:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version.
+# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
-# PATCH-FIX-UPSTREAM cairo-fix-wrong-allocation bnc#758422 fdo#49089 jeffm@suse.com -- Fix wrong allocation in _cairo_pdf_surface_add_source_surface
-Patch1:         cairo-fix-wrong-allocation.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -39,6 +37,7 @@ Patch1:         cairo-fix-wrong-allocation.patch
 BuildRequires:  Mesa-devel
 %endif
 BuildRequires:  gtk-doc
+# Needed by patch0
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontconfig)
@@ -148,9 +147,9 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+# Needed by patch0
 NOCONFIGURE=1 ./autogen.sh
 %configure \
     --with-pic \