Update to 1.12.16

.gitignore

@@ -9,3 +9,4 @@ cairo-1.9.14.tar.gz
 /cairo-1.12.8.tar.xz
 /cairo-1.12.10.tar.xz
 /cairo-1.12.14.tar.xz
+/cairo-1.12.16.tar.xz

0003-mempool-Reduce-an-assert-into-an-error-return-for-ge.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.spec

@@ -4,8 +4,8 @@
 
 Summary:	A 2D graphics library
 Name:		cairo
-Version:	1.12.14
+Version:	1.12.16
-Release:	4%{?dist}
+Release:	1%{?dist}
 URL:		http://cairographics.org
 #VCS:		git:git://git.freedesktop.org/git/cairo
 #Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
@@ -15,7 +15,6 @@ 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
-Patch2:		0003-mempool-Reduce-an-assert-into-an-error-return-for-ge.patch
 Patch3:         cairo-multilib.patch
 
 BuildRequires: pkgconfig
@@ -98,7 +97,6 @@ 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 .get_buddy-assert
 %patch3 -p1 -b .multilib
 
 %build
@@ -183,6 +181,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/cairo/
 
 %changelog
+* Wed Aug 28 2013 Kalev Lember <kalevlember@gmail.com> - 1.12.16-1
+- Update to 1.12.16
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-27b634113d0f52152d60ae8e2ec7daa7  cairo-1.12.14.tar.xz
+a1304edcdc99282f478b995ee5f8f854  cairo-1.12.16.tar.xz