From 558985f968e9c6cca71924cc43ea127d1ba0557e Mon Sep 17 00:00:00 2001
From: Ragnar Thomsen <rthomsen@linuxfromscratch.org>
Date: Thu, 7 Feb 2013 20:38:10 +0000
Subject: [PATCH] Cairo 1.12.12. Dammit, I missed commit 11000.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11001 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  3 +++
 x/lib/cairo.xml                    | 19 ++++---------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/general.ent b/general.ent
index be0d47cbff..8d2edf5bc5 100644
--- a/general.ent
+++ b/general.ent
@@ -566,7 +566,7 @@ export -f as_root</userinput></screen>
 <!ENTITY atkmm-version                "2.22.6">
 <!ENTITY at-spi2-core-version         "2.6.3">
 <!ENTITY at-spi2-atk-version          "2.6.2">
-<!ENTITY cairo-version                "1.12.10">
+<!ENTITY cairo-version                "1.12.12">
 <!ENTITY cairomm-version              "1.10.0">
 <!ENTITY cogl-version                 "1.12.2">
 <!ENTITY clutter-version              "1.12.2">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7705cad269..f21840ce0b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,9 @@
     <listitem>
       <para>February 7th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Cairo 1.12.12.</para>
+        </listitem>
         <listitem>
           <para>[rthomsen] - Strigi 0.7.8.</para>
         </listitem>
diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index cf1a3f693c..a3f2d8033f 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
   <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "bddd5c5b734ab4b9683eb0ba363070d4">
-  <!ENTITY cairo-size          "41 MB">
-  <!ENTITY cairo-buildsize     "185 MB">
+  <!ENTITY cairo-md5sum        "9f7315e54885c735dcfdabe77f322d30">
+  <!ENTITY cairo-size          "42 MB">
+  <!ENTITY cairo-buildsize     "152 MB">
   <!ENTITY cairo-time          "1.1 SBU">
 ]>
 
@@ -83,16 +83,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cairo-&cairo-version;-upstream_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -148,8 +138,7 @@
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../cairo-&cairo-version;-upstream_fix-1.patch &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --enable-tee  \
             --enable-xcb  \
             --disable-static &amp;&amp;