From 64e9127b9bd9949281ab1b9b26727babad85c535 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Thu, 13 Nov 2014 15:47:14 -0500
Subject: cairo: Update

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
 src/cairo-3-lto.patch | 46 ----------------------------------------------
 src/cairo.mk          |  4 ++--
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 src/cairo-3-lto.patch

diff --git a/src/cairo-3-lto.patch b/src/cairo-3-lto.patch
deleted file mode 100644
index 4c11a49..0000000
--- a/src/cairo-3-lto.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Add an option to disable LTO which breaks static linking.
-
-diff -Naur cairo-1.12.16/build/configure.ac.warnings cairo-1.12.16.new/build/configure.ac.warnings
---- cairo-1.12.16/build/configure.ac.warnings	2013-08-26 08:07:21.000000000 -0700
-+++ cairo-1.12.16.new/build/configure.ac.warnings	2014-05-08 20:08:11.296371571 -0700
-@@ -36,14 +36,30 @@
- dnl We also abuse the warning-flag facility to enable other compiler
- dnl options.  Namely, the following:
- 
--dnl -flto working really needs a test link, not just a compile
-+AC_ARG_ENABLE(lto,
-+  AS_HELP_STRING([--enable-lto],
-+                 [Enable link-time optimization.]), [
-+if test "x$enableval" = "xyes"; then
-+    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([],[
--	int main(int argc, char **argv) { return 0; }
--],[],[
--	MAYBE_WARN="$safe_MAYBE_WARN"
-+    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
-+], [
-+    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([],[
-+	    int main(int argc, char **argv) { return 0; }
-+    ],[],[
-+	    MAYBE_WARN="$safe_MAYBE_WARN"
-+    ])
- ])
- 
- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
diff --git a/src/cairo.mk b/src/cairo.mk
index 10b4ffe..39c6c0c 100644
--- a/src/cairo.mk
+++ b/src/cairo.mk
@@ -3,8 +3,8 @@
 
 PKG             := cairo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.12.16
-$(PKG)_CHECKSUM := 4f6e337d5d3edd7ea79d1426f575331552b003ec
+$(PKG)_VERSION  := 1.12.18
+$(PKG)_CHECKSUM := a76940b58da9c83b8934264617135326c0918f9d
 $(PKG)_SUBDIR   := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairo-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://cairographics.org/releases/$($(PKG)_FILE)
-- 
cgit v0.12