From 20d0c19e3a30eeb80b014ab5ee4f32d9dd277c70 Mon Sep 17 00:00:00 2001
From: Joshua Granick <joshua@joshuagranick.com>
Date: Wed, 6 May 2015 17:32:27 -0700
Subject: [PATCH] Fix Cairo build for Linux

---
 project/Build.xml  | 4 ++++
 project/lib/cairo  | 2 +-
 project/lib/pixman | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 3ca33d05d..2c8a6915b 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -43,6 +43,10 @@
 			
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include" />
 			<compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" />
+			<compilerflag value="-DCAIRO_HAS_PTHREAD" unless="windows" />
+			<compilerflag value="-DHAVE_STDINT_H" unless="windows" />
+			<compilerflag value="-DHAVE_UINT64_T" unless="windows" />
+			<compilerflag value="-DHAVE_PTHREADS" unless="windows" />
 			
 			<file name="src/graphics/cairo/CairoBindings.cpp" />
 			
diff --git a/project/lib/cairo b/project/lib/cairo
index 83548b922..47662d0e4 160000
--- a/project/lib/cairo
+++ b/project/lib/cairo
@@ -1 +1 @@
-Subproject commit 83548b92275068f3e9cdb9d9893457714a019e67
+Subproject commit 47662d0e4dc7bdefe34953f547f33cfd89c652b0
diff --git a/project/lib/pixman b/project/lib/pixman
index 65dced727..95011bab2 160000
--- a/project/lib/pixman
+++ b/project/lib/pixman
@@ -1 +1 @@
-Subproject commit 65dced727afeba560ab23cf2b313036569f5649d
+Subproject commit 95011bab230cdb08839f5696df7031792f371bc2