r2815 - in trunk/BOOK: . introduction/welcome xsoft/graphweb

igor at linuxfromscratch.org igor at linuxfromscratch.org
Fri Oct 15 06:16:30 PDT 2004


Author: igor
Date: 2004-10-15 07:16:28 -0600 (Fri, 15 Oct 2004)
New Revision: 2815

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
Log:
Updated to Firefox-0.10.1.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-10-15 04:04:47 UTC (rev 2814)
+++ trunk/BOOK/general.ent	2004-10-15 13:16:28 UTC (rev 2815)
@@ -1,4 +1,4 @@
-<!ENTITY day          "14">
+<!ENTITY day          "15">
 <!ENTITY month        "10">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -364,7 +364,7 @@
 
 <!-- Chapter 35 -->        
 <!ENTITY mozilla-version              "1.7.1">  
-<!ENTITY firefox-version              "1.0PR"> 
+<!ENTITY firefox-version              "0.10.1"> 
 <!ENTITY galeon-version               "1.3.14a"> 
 <!ENTITY dillo-version                "0.8.2">  
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-10-15 04:04:47 UTC (rev 2814)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-10-15 13:16:28 UTC (rev 2815)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>October 15th, 2004 [igor]: Updated to
+Firefox-0.10.1.</para></listitem>
+
 <listitem><para>October 14th, 2004 [igor]: Updated to GLib-2.4.7,
 Pango-1.6.0, ATK-1.8.0, GTK+-2.4.13 and libIDL-0.8.4.</para></listitem>
 

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	2004-10-15 04:04:47 UTC (rev 2814)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	2004-10-15 13:16:28 UTC (rev 2815)
@@ -4,9 +4,9 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY firefox-download-http "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10/firefox-&firefox-version;-source.tar.bz2">
-  <!ENTITY firefox-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10/firefox-&firefox-version;-source.tar.bz2">
-  <!ENTITY firefox-size          "32.4 MB">
+  <!ENTITY firefox-download-http "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/firefox-1.0PR-source.tar.bz2">
+  <!ENTITY firefox-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/firefox-1.0PR-source.tar.bz2">
+  <!ENTITY firefox-size          "31 MB">
   <!ENTITY firefox-buildsize     "575 MB">
   <!ENTITY firefox-time          "11.05 SBU">
 ]>
@@ -32,18 +32,12 @@
 <listitem><para>Download (FTP): <ulink
 url="&firefox-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &firefox-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &firefox-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &firefox-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing="compact">
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/firefox-&firefox-version;-ft218-1.patch"/></para></listitem>
-</itemizedlist></sect3>
-
 <sect3><title><application>Firefox</application> dependencies</title>
 <sect4><title>Required</title>
 <para>
@@ -80,14 +74,14 @@
 <screen><userinput><command>export MOZILLA_OFFICIAL="1" &&
 export BUILD_OFFICIAL="1" &&
 export MOZ_PHOENIX="1" &&
-patch -Np1 -i ../firefox-&firefox-version;-ft218-1.patch &&
-./configure --prefix=/opt/firefox-&firefox-version; \
+./configure --prefix=/usr \
             --with-system-zlib \
             --with-system-png \
             --enable-default-toolkit=gtk2 \
             --disable-mailnews \
             --disable-ldap \
             --enable-xft \
+            --disable-freetype2 \
             --enable-crypto \
             --enable-xinerama \
             --enable-single-profile \
@@ -105,19 +99,22 @@
             --disable-profilesharing &&
 make &&
 make install &&
-install -d /opt/firefox-&firefox-version;/include/firefox-0.10/nss &&
+install -d /usr/include/firefox-&firefox-version;/nss &&
 cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
-    /opt/firefox-&firefox-version;/include/firefox-0.10/nss &&
-chown -R root:root /opt/firefox-&firefox-version;/include/firefox-0.10/nss &&
-ln -sf /opt/firefox-&firefox-version;/bin/firefox /usr/bin/MozillaFirefox</command></userinput></screen>
+    /usr/include/firefox-&firefox-version;/nss &&
+chown -R root:root /usr/include/firefox-&firefox-version;/nss</command></userinput></screen>
 
+<!--
+ln -sf firefox /usr/bin/MozillaFirefox
+-->
+
 <para>You might want to add the <option>--with-system-jpeg</option>
 switch to the <command>configure</command> script if you have
 <application>libjpeg</application> installed.</para>
 
 <para>To enable multi-user operation, execute the following:</para>
 
-<screen><userinput><command>cd /opt/firefox-&firefox-version;/lib/firefox-0.10 &&
+<screen><userinput><command>cd /usr/lib/firefox-&firefox-version; &&
 export LD_LIBRARY_PATH="$PWD" &&
 export MOZILLA_FIVE_HOME="$PWD" &&
 ./regxpcom &&
@@ -125,10 +122,10 @@
 touch `find . -name *.rdf`</command></userinput></screen>
 
 <note><para>You should run 
-<command>/opt/firefox-&firefox-version;/bin/firefox</command> 
+<command>/usr/bin/firefox</command> 
 once as the root user (or any user with write privileges) to 
 create some necessary additional files in the 
-<filename class='directory'>/opt/firefox-&firefox-version;</filename> 
+<filename class='directory'>/usr</filename> 
 hierarchy.</para></note>
 
 </sect2>




More information about the blfs-book mailing list