Accepting request 196496 from home:dimstar:branches:GNOME:Factory

Update to 1.12.16

OBS-URL: https://build.opensuse.org/request/show/196496
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=76

cairo-1.12.14.tar.xz

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

cairo-1.12.16.tar.xz

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

cairo-reduce-buddy-assertion.patch

@@ -1,34 +0,0 @@
-From 01a8bf01c6508a4fea8d40371c3049e7a2f7908a Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 15 Mar 2013 09:08:00 +0000
-Subject: [PATCH] mempool: Reduce an assert into an error return for
- get_buddy()
-
-If we ask for a buddy that is outside of our allocation that is an
-error that should not happen with a power-of-two allocated zone...
-However, since it has been seen in the wild, we can safely return that
-there is no buddy rather than die in a too-late assert.
-
-Reported-by: Anton Eliasson <devel@antoneliasson.se>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- src/cairo-mempool.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/cairo-mempool.c b/src/cairo-mempool.c
-index 96e4a62..751ede3 100644
---- a/src/cairo-mempool.c
-+++ b/src/cairo-mempool.c
-@@ -157,7 +157,8 @@ get_buddy (cairo_mempool_t *pool, size_t offset, int bits)
- {
-     struct _cairo_memblock *block;
- 
--    assert (offset + (1 << bits) <= pool->num_blocks);
-+    if (offset + (1 << bits) >= pool->num_blocks)
-+	return NULL; /* invalid */
- 
-     if (BITTEST (pool, offset + (1 << bits) - 1))
- 	return NULL; /* buddy is allocated */
--- 
-1.8.1.4
-

cairo.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Aug 27 06:41:01 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.12.16:
+  + Set the correct orientation for simple boxes with a negative
+    scale factor.
+  + Fix the creation of the shading dictionary in PDF.
+  + Avoid upscaling bitmap fonts if possible.
+  + Fix an assertion failure within the mempool allocator for
+    shared memory.
+  + Fix allocation size for CFF subsets.
+  + Export cairo_matrix_t for GObject bindings.
+  + Stop leaking the image data when loading PNGs.
+  + Prevent an assertion failure when creating similar GL surfaces
+    larger than supported by hardware.
+  + Bugs fixed: fdo#61451, fdo#62885, fdo#61876, fdo#63196,
+    fdo#697357, fdo#61592, fdo#68014, fdo#63787.
+- Drop cairo-reduce-buddy-assertion.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Jul  8 18:49:31 CEST 2013 - sbrabec@suse.cz
 

cairo.spec

@@ -20,7 +20,7 @@
 %define build_gl_backend 1
 
 Name:           cairo
-Version:        1.12.14
+Version:        1.12.16
 Release:        0
 Summary:        Vector Graphics Library with Cross-Device Output Support
 License:        LGPL-2.1+ or MPL-1.1
@@ -30,8 +30,6 @@ Source:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # 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-reduce-buddy-assertion.patch bnc#828074 sbrabec@suse.cz -- Fix assert crash on unaligned memory, taken from git, commit 01a8bf0
-Patch1:         cairo-reduce-buddy-assertion.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -46,7 +44,7 @@ BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pkgconfig(pixman-1) >= 0.16.0
 BuildRequires:  pkgconfig(x11)
 %if %build_xcb_backend
 BuildRequires:  pkgconfig(xcb)
@@ -150,7 +148,6 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Needed by patch0