Changeset fcd66369

Timestamp:

09/06/2013 07:35:03 AM (11 years ago)

Author:

Igor Živković <igor@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

40452959

Parents:

931f38f

Message:

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

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (5 diffs)
• other/thunderbird.xml (modified) (5 diffs)

xsoft/graphweb/firefox.xml

@@ -73 +73 @@
     </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>
@@ -172 +176 @@
 
 # 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:
@@ -235 +243 @@
 
     <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>
       Compile <application>Firefox</application> by issuing the following
       commands:
@@ -396 +412 @@
 
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Name=Firefox Web Browser
@@ -407 +423 @@
 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
 

xsoft/other/thunderbird.xml

@@ -71 +71 @@
           Estimated build time: &thunderbird-time;
         </para>
+      </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>
@@ -154 +162 @@
 #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 +210 @@
 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>
@@ -323 +343 @@
 
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
-[Desktop Entry]
+<literal>[Desktop Entry]
 Encoding=UTF-8
 Name=Thunderbird Mail
@@ -334 +354 @@
 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