cairo: Update to 1.14.2

mingw-w64-cairo/0002-fix-using-strings.patch

@@ -1,15 +0,0 @@
---- cairo-1.14.0/build/aclocal.float.m4.orig	2014-10-14 01:46:33.000000000 +0000
-+++ cairo-1.14.0/build/aclocal.float.m4	2014-10-14 06:16:08.348180700 +0000
-@@ -31,10 +31,10 @@
- 
- ]])], [
- 
--if strings - conftest | grep noonsees >/dev/null ; then
-+if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then
-   ax_cv_c_float_words_bigendian=yes
- fi
--if strings - conftest | grep seesnoon >/dev/null ; then
-+if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then
-   if test "$ax_cv_c_float_words_bigendian" = unknown; then
-     ax_cv_c_float_words_bigendian=no
-   else

mingw-w64-cairo/0027-Bug-53121-hack-around.all.patch

@@ -1,39 +0,0 @@
-From 844455c14f8e9e4767fd661e475a9c6fdea9d22e Mon Sep 17 00:00:00 2001
-From: Massimo Valentini <mvalentini@src.gnome.org>
-Date: Wed, 11 Sep 2013 18:10:38 +0200
-Subject: [PATCH] Bug 53121 - My program runs successfully with...
-
-Cairo-1.10.2, but getting SIGSEGV with 1.12.2.
----
- src/win32/cairo-win32-display-surface.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/win32/cairo-win32-display-surface.c b/src/win32/cairo-win32-display-surface.c
-index 5ecdbee..965f2c4 100644
---- a/src/win32/cairo-win32-display-surface.c
-+++ b/src/win32/cairo-win32-display-surface.c
-@@ -455,17 +455,17 @@ _cairo_win32_display_surface_map_to_image (void                    *abstract_sur
- 	surface->fallback =
- 	    _cairo_win32_display_surface_create_for_dc (surface->win32.dc,
- 							surface->win32.format,
--							surface->win32.extents.width,
--							surface->win32.extents.height);
-+							surface->win32.extents.x + surface->win32.extents.width,
-+							surface->win32.extents.y + surface->win32.extents.height);
- 	if (unlikely (status = surface->fallback->status))
- 	    goto err;
- 
- 	if (!BitBlt (to_win32_surface(surface->fallback)->dc,
--		     0, 0,
-+		     surface->win32.extents.x, surface->win32.extents.y,
- 		     surface->win32.extents.width,
- 		     surface->win32.extents.height,
- 		     surface->win32.dc,
--		     0, 0,
-+		     surface->win32.extents.x, surface->win32.extents.y,
- 		     SRCCOPY)) {
- 	    status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR);
- 	    goto err;
--- 
-1.7.6.5
-

mingw-w64-cairo/PKGBUILD

@@ -3,8 +3,8 @@
 
 _realname=cairo
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.14.0
-pkgrel=3
+pkgver=1.14.2
+pkgrel=1
 pkgdesc="Cairo vector graphics library (mingw-w64)"
 arch=('any')
 url="http://cairographics.org"
@@ -28,37 +28,31 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 optdepends=("${MINGW_PACKAGE_PREFIX}-glib2: libcairo-gobject")
 options=('strip' 'staticlibs')
 source=("http://cairographics.org/releases/cairo-${pkgver}.tar.xz"
-        0002-fix-using-strings.patch
         0009-standalone-headers.mingw.patch
         0013-mozilla-transparent-windows.all.patch
         0022-dont-fail-argb-similar.all.patch
-        0026-create-argb-fonts.all.patch
-        0027-Bug-53121-hack-around.all.patch
-        fix-crash-in-fill-xrgb32-lerp-opaque-spans.patch)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
-          'eed29a424e5e0bc9bd8d651b6237e541273c3f93'
+        0026-create-argb-fonts.all.patch)
+sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24'
           '58c548d2791ba20dd7f6e328ff596f746df3aa10'
           'b4b8c6f4931814e7e77ddeb98fecaf70cb807e04'
           'fa601d6d2b2c75b0b1608ab3fa9c2e5b6cc31c9e'
-          '9c0e533614782a41af2c3806a43ab7fe9d6a5431'
-          'b74c9998d960a64fbf606ebe0284187add0da55a'
-          '00b79ab41635a4f42311721bebbb9b3d49f09f46')
+          '9c0e533614782a41af2c3806a43ab7fe9d6a5431')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/0002-fix-using-strings.patch
+  #patch -p1 -i ${srcdir}/0002-fix-using-strings.patch
   patch -p1 -i ${srcdir}/0009-standalone-headers.mingw.patch
   patch -p1 -i ${srcdir}/0013-mozilla-transparent-windows.all.patch
   patch -p1 -i ${srcdir}/0022-dont-fail-argb-similar.all.patch
   patch -p1 -i ${srcdir}/0026-create-argb-fonts.all.patch
-  patch -p1 -i ${srcdir}/0027-Bug-53121-hack-around.all.patch
-  patch -p1 -i ${srcdir}/fix-crash-in-fill-xrgb32-lerp-opaque-spans.patch
+  #patch -p1 -i ${srcdir}/0027-Bug-53121-hack-around.all.patch
+  #patch -p1 -i ${srcdir}/fix-crash-in-fill-xrgb32-lerp-opaque-spans.patch
 
   autoreconf -fi
 }
 
 build() {
-  export lt_cv_deplibs_check_method='pass_all'
+  # export lt_cv_deplibs_check_method='pass_all'
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
   CFLAGS+=" -Wno-implicit-function-declaration"

mingw-w64-cairo/fix-crash-in-fill-xrgb32-lerp-opaque-spans.patch

@@ -1,29 +0,0 @@
-From 5c82d91a5e15d29b1489dcb413b24ee7fdf59934 Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <bryce@osg.samsung.com>
-Date: Wed, 3 Dec 2014 19:28:15 -0800
-Subject: image: Fix crash in _fill_xrgb32_lerp_opaque_spans
-
-If a span length is negative don't go out of bounds processing the fill
-data.
-
-Patch thanks to Ilya Sakhnenko <ilia.softway@gmail.com> on mailing list.
-
-Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
-
-diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
-index 6ff0f09..48072f8 100644
---- a/src/cairo-image-compositor.c
-+++ b/src/cairo-image-compositor.c
-@@ -2242,10 +2242,10 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
- 				     spans[0].x, y, len, 1, r->u.fill.pixel);
- 		    } else {
- 			uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*y + spans[0].x*4);
--			while (len--)
-+			while (len-- > 0)
- 			    *d++ = r->u.fill.pixel;
- 		    }
--		} else while (len--) {
-+		} else while (len-- > 0) {
- 		    *d = lerp8x4 (r->u.fill.pixel, a, *d);
- 		    d++;
- 		}