[blfs-book] r12304 - in trunk/BOOK: introduction/welcome x/installing x/lib xsoft/graphweb xsoft/other

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Fri Nov 29 15:40:21 PST 2013


Author: fernando
Date: Fri Nov 29 15:40:21 2013
New Revision: 12304

Log:
Fix libXft-2.3.1, xulrunner-25.0.1, firefox-25.0.1, seamonkey-2.22.1 and thunderbird-3.1.20 to build with FreeType-2.5.1.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/lib/xulrunner.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
   trunk/BOOK/xsoft/graphweb/seamonkey.xml
   trunk/BOOK/xsoft/other/thunderbird.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -47,6 +47,15 @@
       <para>November 29th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Fix xulrunner-25.0.1, firefox-25.0.1,
+          seamonkey-2.22.1 and thunderbird-3.1.20 to build with FreeType-2.5.1.
+          Fixes <ulink url="&blfs-ticket-root;4387">#4387</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Fix libXft-2.3.1 to build with FreeType-2.5.1.
+          Fixes <ulink url="&blfs-ticket-root;4383">#4383</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to xterm-298. Fixes
           <ulink url="&blfs-ticket-root;4380">#4380</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/x/installing/x7lib.xml
==============================================================================
--- trunk/BOOK/x/installing/x7lib.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/x/installing/x7lib.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -148,6 +148,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libXft-&libXft-version;-freetype_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -248,6 +258,9 @@
     libXfont-[0-9]* )
       ./configure $XORG_CONFIG --disable-devel-docs
     ;;
+    libXft-[0-9]* )
+      patch -Np1 -i libXft-&libXft-version;-freetype_fix-1.patch
+    ;;
     libXt-[0-9]* )
       ./configure $XORG_CONFIG \
                   --with-appdefaultdir=/etc/X11/app-defaults

Modified: trunk/BOOK/x/lib/xulrunner.xml
==============================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/x/lib/xulrunner.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -75,6 +75,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xulrunner-&xulrunner-version;-freetype-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -222,7 +232,8 @@
       prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
     </para></note>
 
-<screen><userinput>make -f client.mk</userinput></screen>
+<screen><userinput>patch -Np1 -i xulrunner-&xulrunner-version;-freetype-1.patch && 
+make -f client.mk</userinput></screen>
 
     <para>
       This package does not come with a test suite.

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -72,6 +72,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/firefox-&firefox-version;-freetype-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -235,7 +245,8 @@
       <envar>SHELL=/bin/bash</envar> to the first make command below.
     </para></note>
       
-<screen><userinput>sed -i 's@ ""@@' browser/base/Makefile.in &&
+<screen><userinput>patch -Np1 -i firefox-&firefox-version;-freetype-1.patch &&
+sed -i 's@ ""@@' browser/base/Makefile.in &&
 make -f client.mk</userinput></screen>
 
     <para>

Modified: trunk/BOOK/xsoft/graphweb/seamonkey.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/seamonkey.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/xsoft/graphweb/seamonkey.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -82,6 +82,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-freetype-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">SeaMonkey Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -201,7 +211,8 @@
 export C_INCLUDE_PATH=$XORG_PREFIX/include</userinput></screen>
     </note>
 
-<screen><userinput>make -f client.mk &&
+<screen><userinput>patch -Np1 -i seamonkey-&seamonkey-version;-freetype-1.patch &&
+make -f client.mk &&
 make -C moz-build-dir/suite/installer</userinput></screen>
 
     <para>

Modified: trunk/BOOK/xsoft/other/thunderbird.xml
==============================================================================
--- trunk/BOOK/xsoft/other/thunderbird.xml	Fri Nov 29 00:24:27 2013	(r12303)
+++ trunk/BOOK/xsoft/other/thunderbird.xml	Fri Nov 29 15:40:21 2013	(r12304)
@@ -72,6 +72,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-freetype-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -211,7 +221,8 @@
       prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
     </para></note>
 
-<screen><userinput>make -f client.mk &&
+<screen><userinput>patch -Np1 -i thunderbird-&thunderbird-version;-freetype-1.patch &&
+make -f client.mk &&
 make -C thunderbuild/mail/installer</userinput></screen>
 
     <para>



More information about the blfs-book mailing list