From fcd66369cd951c5a4105c6220bbce75bb11895af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Fri, 6 Sep 2013 07:35:03 +0000
Subject: [PATCH] add option to install firefox and thunderbird with system
 cairo

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11779 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 xsoft/graphweb/firefox.xml  | 24 ++++++++++++++++++++----
 xsoft/other/thunderbird.xml | 24 ++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index 2e294c675c..26196b7089 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -72,12 +72,16 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Download (if linking against xulrunner)</bridgehead>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Recommended patch: <ulink
         url="&patch-root;/firefox-&firefox-version;-search_box_fix-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Optional patch: <ulink
+        url="&patch-root;/firefox-&firefox-version;-system_cairo-1.patch"/></para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
@@ -171,11 +175,15 @@ ac_add_options --disable-necko-wifi
 ac_add_options --disable-libnotify
 
 # Uncomment these lines if you have installed optional dependencies:
-# GStreamer is necesary for H.264 video playback in HTML5 Video Player
+# GStreamer is necessary for H.264 video playback in HTML5 Video Player
 #ac_add_options --enable-gstreamer
 #ac_add_options --enable-system-hunspell
 #ac_add_options --enable-startup-notification
 
+# Uncomment this line if you compiled Cairo with --enable-tee switch and want
+# to use it instead of the bundled one:
+#ac_add_options --enable-system-cairo
+
 # If you have not installed Yasm then uncomment this line:
 #ac_add_options --disable-webm
 
@@ -231,6 +239,14 @@ EOF</userinput></screen>
     </para>
 
 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch
+</userinput></screen>
+
+    <para>
+      If you are building against a system-installed <application>Cairo</application>
+      apply the patch:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-system_cairo-1.patch
 </userinput></screen>
 
     <para>
@@ -395,7 +411,7 @@ cp -v dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
 mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Name=Firefox Web Browser
 Comment=Browse the World Wide Web
@@ -406,7 +422,7 @@ Type=Application
 Icon=firefox
 Categories=GNOME;GTK;Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
+StartupNotify=true</literal>
 EOF
 
 ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index d38de3f750..47db473bbf 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -73,6 +73,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Optional patch: <ulink
+        url="&patch-root;/thunderbird-&thunderbird-version;-system_cairo-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -153,6 +161,10 @@ ac_add_options --disable-libnotify
 #ac_add_options --enable-system-hunspell
 #ac_add_options --enable-startup-notification
 
+# Uncomment this line if you compiled Cairo with --enable-tee switch and want
+# to use it instead of the bundled one:
+#ac_add_options --enable-system-cairo
+
 # If you have not installed Yasm then uncomment this line:
 #ac_add_options --disable-webm
 
@@ -198,6 +210,14 @@ ac_add_options --with-system-zlib
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbuild
 EOF</userinput></screen>
 
+    <para>
+      If you are building against a system-installed <application>Cairo</application>
+      apply the patch:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-system_cairo-1.patch
+</userinput></screen>
+
     <para>
       Compile <application>Thunderbird</application> by issuing the following
       commands:
@@ -322,7 +342,7 @@ ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput
 mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Name=Thunderbird Mail
 Comment=Send and receive mail with Thunderbird
@@ -333,7 +353,7 @@ Type=Application
 Icon=thunderbird
 Categories=Application;Network;Email;
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
-StartupNotify=true
+StartupNotify=true</literal>
 EOF
 
 ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \