[gimp] build/win: Upgrade cairo to 1.14.0

[Michael Henning <mhenning src gnome org>]

commit 8e4511b8c14d2df2f0e0464b21093099a4b9cae5
Author: Michael Henning <drawoc darkrefraction com>
Date:   Sat Oct 25 21:33:23 2014 -0400

    build/win: Upgrade cairo to 1.14.0

 build/windows/jhbuild/build.jhbuildrc              |    5 +-
 build/windows/jhbuild/gtk+.moduleset               |    8 +--
 .../jhbuild/patches/cairo-disable-lto.patch        |   51 --------------------
 3 files changed, 6 insertions(+), 58 deletions(-)
---
diff --git a/build/windows/jhbuild/build.jhbuildrc b/build/windows/jhbuild/build.jhbuildrc
index cfc9ff7..bd51fe1 100644
--- a/build/windows/jhbuild/build.jhbuildrc
+++ b/build/windows/jhbuild/build.jhbuildrc
@@ -142,8 +142,7 @@ module_autogenargs['cairo']      = autogenargs + """ --enable-xlib=no \
                                                      --enable-xcb=no \
                                                      --enable-xcb-shm=no \
                                                      --enable-pthread=no \
-                                                     --enable-win32-font=yes \
-                                                     --disable-lto"""
+                                                     --enable-win32-font=yes"""
 
 module_autogenargs['pixman']     = autogenargs + """ --enable-gtk=no"""
 
@@ -238,6 +237,8 @@ module_extra_env.update (
        {'PREFIX': prefix},
  'freetype2':
     {'LIBPNG_CFLAGS': ' ', 'LIBPNG_LDFLAGS': '-lpng'},
+ 'cairo':
+    {'ax_cv_c_float_words_bigendian': 'no'},
 
 # Ensure that gimp doesn't get the host machine's freetype-config
   'gimp-dev':
diff --git a/build/windows/jhbuild/gtk+.moduleset b/build/windows/jhbuild/gtk+.moduleset
index 5616aa4..a9fb105 100644
--- a/build/windows/jhbuild/gtk+.moduleset
+++ b/build/windows/jhbuild/gtk+.moduleset
@@ -20,11 +20,9 @@
                href="http://download.icu-project.org/files/"; />
 
 <autotools id="cairo">
-       <branch version="1.12.16" repo="cairographics.org"
-                       module="cairo-1.12.16.tar.xz"
-                       hash="sha1:4f6e337d5d3edd7ea79d1426f575331552b003ec">
-               <!-- From cairo git -->
-               <patch file="cairo-disable-lto.patch" strip="1"/>
+       <branch version="1.14.0" repo="cairographics.org"
+                       module="cairo-1.14.0.tar.xz"
+                       hash="sha1:53cf589b983412ea7f78feee2e1ba9cea6e3ebae">
        </branch>
        <dependencies>
                <dep package="zlib"/>