From 9a3726eb2f4d7b3b0a1ba28e7674ed66d0b82bf4 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Sat, 7 Feb 2015 23:08:27 +0000
Subject: [PATCH] Patch cairo.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15467 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  3 +++
 x/lib/cairo.xml                    | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a3d3a68823..4681199580 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,9 @@
     <listitem>
       <para>February 7th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch cairo to prevent crashes with certain files.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to gnumeric-1.12.20. Fixes
           <ulink url="&blfs-ticket-root;6114">#6114</ulink>.</para>
diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index fd66c5841d..d7ffe7c10a 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -83,6 +83,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/cairo-&cairo-version;-upstream_fixes-2.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -125,7 +135,8 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
+<screen><userinput>patch -Np1 -i ../cairo-&cairo-version;-upstream_fixes-2.patch &amp;&amp;
+./configure --prefix=/usr    \
             --disable-static \
             --enable-tee &amp;&amp;
 make</userinput></screen>