version up : cairo 1.14.2.

component/gtk-2/buildout.cfg

@@ -24,14 +24,9 @@ parts =
 
 [cairo]
 recipe = slapos.recipe.cmmi
-url = http://cairographics.org/releases/cairo-1.12.16.tar.xz
-md5sum = a1304edcdc99282f478b995ee5f8f854
+url = http://cairographics.org/releases/cairo-1.14.2.tar.xz
+md5sum = e1cdfaf1c6c995c4d4c54e07215b0118
 pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/cairo-fix_gcc4.9_ftbfs.patch#d4c843a655be8f1df548c9492d253359
-pre-configure =
-  autoreconf -vfi
 configure-options =
   --disable-static
   --disable-gtk-doc-html
@@ -41,10 +36,9 @@ configure-options =
   --disable-xcb
   --enable-ft
   --enable-fc
-  --disable-lto
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/gtk-2/cairo-fix_gcc4.9_ftbfs.patch

-From c3645d97ebd24c6f7ad850785d585aebc706a11c Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <b.harrington@samsung.com>
-Date: Tue, 08 Jul 2014 20:14:20 +0000
-Subject: configure.ac: Add a --disable-lto configure option
-
-Link-Time Optimization seems to be stable enough with gcc 4.8 and 4.9,
-but has proven to be an issue in the past for many cairo users (webkit,
-efl, ubuntu, opensuse, gentoo, arch...) who carry patches to disable it.
-
-Gentoo's patch[1] adds a --disable-lto option to leave it enabled by
-default but give users the ability to work around lto related build
-problems (c.f. fdo #77060).  Patch appears to have been authored by
-Alexandre Rostovtsev[2].
-
-1: sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
-2: https://bugs.gentoo.org/show_bug.cgi?id=509552
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60852
-Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
-Reviewed-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f984eb2..a72d948 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
- 
- dnl -flto working really needs a test link, not just a compile
- 
--safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto"
--AC_TRY_LINK([],[
-+AC_ARG_ENABLE(lto,
-+  AS_HELP_STRING([--disable-lto],
-+                 [Do not try to use Link-Time Optimization]))
-+if test "x$enable_lto" != "xno"; then
-+   safe_MAYBE_WARN="$MAYBE_WARN"
-+   MAYBE_WARN="$MAYBE_WARN -flto"
-+   AC_TRY_LINK([],[
- 	int main(int argc, char **argv) { return 0; }
--],[],[
-+   ],[],[
- 	MAYBE_WARN="$safe_MAYBE_WARN"
--])
-+   ])
-+fi
- 
- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
- 
---
-cgit v0.9.0.2-2-gbebe