[cairo] Update to 1.14.2

Kalev Lember kalev at fedoraproject.org
Wed Mar 11 14:02:33 UTC 2015


commit b83c5b66410e99d285fd2a7aa461a4bf81364550
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 11 14:27:05 2015 +0100

    Update to 1.14.2

 .gitignore                                         |  1 +
 ...Don-t-crash-when-swapping-a-0-sized-glyph.patch | 43 ----------------------
 ...Don-t-crash-when-swapping-a-0-sized-glyph.patch | 43 ----------------------
 ...ix_crash_in_fill_xrgb32_lerp_opaque_spans.patch | 32 ----------------
 cairo.spec                                         | 18 +++------
 sources                                            |  2 +-
 6 files changed, 7 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 858c2c5..1e52b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ cairo-1.9.14.tar.gz
 /cairo-1.12.16.tar.xz
 /cairo-1.13.1-337ab1f.tar.xz
 /cairo-1.14.0.tar.xz
+/cairo-1.14.2.tar.xz
diff --git a/cairo.spec b/cairo.spec
index 9fbda6c..ae565d6 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -4,22 +4,14 @@
 
 Summary:	A 2D graphics library
 Name:		cairo
-Version:	1.14.0
-Release:	3%{?dist}
+Version:	1.14.2
+Release:	1%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.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
 Patch3:         cairo-multilib.patch
-#
-# Fix for dot crashes
-# https://bugzilla.redhat.com/show_bug.cgi?id=1183242
-# Already upstreamed: 
-# http://cgit.freedesktop.org/cairo/patch/src/cairo-image-compositor.c?id=5c82d91a5e15d29b1489dcb413b24ee7fdf59934
-Patch4:         cairo-fix_crash_in_fill_xrgb32_lerp_opaque_spans.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
@@ -94,10 +86,7 @@ This package contains tools for working with the cairo graphics library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .xlib-swap
-%patch1 -p1 -b .xcb-swap
 %patch3 -p1 -b .multilib
-%patch4 -p1
 
 %build
 %configure --disable-static	\
@@ -181,6 +170,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/cairo/
 
 %changelog
+* Wed Mar 11 2015 Kalev Lember <kalevlember at gmail.com> - 1.14.2-1
+- Update to 1.14.2
+
 * Sat Feb 21 2015 Till Maas <opensource at till.name> - 1.14.0-3
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
diff --git a/sources b/sources
index 51a7883..cd7efcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc3a5edeba703f906f2241b394f0cced  cairo-1.14.0.tar.xz
+e1cdfaf1c6c995c4d4c54e07215b0118  cairo-1.14.2.tar.xz


More information about the scm-commits mailing list