[blfs-book] r9258 - in trunk/BOOK: . introduction/welcome x/lib xsoft/graphweb

andy at linuxfromscratch.org andy at linuxfromscratch.org
Wed Feb 1 06:22:34 PST 2012


Author: andy
Date: 2012-02-01 07:22:30 -0700 (Wed, 01 Feb 2012)
New Revision: 9258

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/xulrunner.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
Log:
firefox-10.0

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-01 14:02:37 UTC (rev 9257)
+++ trunk/BOOK/general.ent	2012-02-01 14:22:30 UTC (rev 9258)
@@ -601,7 +601,7 @@
 <!ENTITY freeglut-version             "2.6.0">
 <!ENTITY goffice-version              "0.8.17">
 <!ENTITY mesalib-version              "7.9">
-<!ENTITY xulrunner-version            "9.0.1">
+<!ENTITY xulrunner-version            "10.0">
 <!ENTITY webkitgtk-version            "1.6.1">
 <!ENTITY libsexy-version              "0.1.11">
 <!ENTITY libnotify-version            "0.4.5">
@@ -820,7 +820,7 @@
 
 <!-- Chapter 37 -->
 <!ENTITY seamonkey-version            "2.6.1">
-<!ENTITY firefox-version              "9.0.1">
+<!ENTITY firefox-version              "10.0">
 
 <!-- Obsolete
 <!ENTITY dillo-version                "0.8.5">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-01 14:02:37 UTC (rev 9257)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-01 14:22:30 UTC (rev 9258)
@@ -47,6 +47,9 @@
         <listitem>
           <para>[abenton] - libvpx 1.0.0</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Firefox 10.0</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	2012-02-01 14:02:37 UTC (rev 9257)
+++ trunk/BOOK/x/lib/xulrunner.xml	2012-02-01 14:22:30 UTC (rev 9258)
@@ -7,8 +7,8 @@
   <!ENTITY xulrunner-download-http "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY xulrunner-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
-  <!ENTITY xulrunner-md5sum        "7cf2bd379792a9b232267c6a79680566">
-  <!ENTITY xulrunner-size          "70.8 MB">
+  <!ENTITY xulrunner-md5sum        "13c61203ccfa583e5a54b4dc22f41233">
+  <!ENTITY xulrunner-size          "72 MB">
   <!ENTITY xulrunner-buildsize     "2.6 GB (440 MB installed)">
   <!ENTITY xulrunner-time          "22 SBU">
 ]>
@@ -119,8 +119,7 @@
     <command>./configure --help</command>. You should review the entire file
     and comment or uncomment options as necessary.</para>
 
-<screen><?dbfo keep-together="auto"?><userinput>patch -p1 < ../xulrunner-&xulrunner-version;-libpng-1.5-1.patch &&
-cat > mozconfig << "EOF"
+<screen><userinput>cat > mozconfig << "EOF"
 # If you have a multicore machine you can speed up the build by running
 # several jobs at once, but if you have a single core, delete this line:
 mk_add_options MOZ_MAKE_FLAGS="-j4"
@@ -167,7 +166,9 @@
     <para>Install <application>Xulrunner</application> by issuing the
     following commands:</para>
 
-<screen><userinput>sed -i '/Version/aRequires: nspr >= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in &&
+<screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' \
+  configure &&
+sed -i '/Version/aRequires: nspr >= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in &&
 make -f client.mk</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -198,6 +199,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i 's#VPX_CODEC_USE ...</command>: This fixes
+    <application>Xulrunner's</application> <command>configure</command>
+    script to properly detect libvpx-v1.0.0. It is not needed if you have
+    libvpx-v0.9.7 or earlier installed or if you've not installed
+    <xref linkend="libvpx"/>.</para>
+
     <para><command>sed ... Requires: nspr</command>: If you try to build
     <application>Yelp</application> without this, the
     prtypes header from NSPR will not be found. It is arguable whose error this

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	2012-02-01 14:02:37 UTC (rev 9257)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	2012-02-01 14:22:30 UTC (rev 9258)
@@ -6,8 +6,8 @@
 
   <!ENTITY firefox-download-http "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY firefox-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "7cf2bd379792a9b232267c6a79680566">
-  <!ENTITY firefox-size          "70.8 MB">
+  <!ENTITY firefox-md5sum        "13c61203ccfa583e5a54b4dc22f41233">
+  <!ENTITY firefox-size          "72 MB">
   <!ENTITY firefox-buildsize     "3 GB (33 MB installed)">
   <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
     an installed Xulrunner)">
@@ -57,15 +57,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch:
-        <ulink
-        url="&patch-root;/firefox-&firefox-version;-libpng-1.5-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -115,8 +106,7 @@
     entire file and uncomment any other desired options. Create the file by
     issuing the following command:</para>
 
-<screen><?dbfo keep-together="auto"?><userinput>patch -p1 < ../firefox-&firefox-version;-libpng-1.5-1.patch &&
-cat > mozconfig << "EOF"
+<screen><userinput>cat > mozconfig << "EOF"
 # If you have a multicore machine you can speed up the build by running
 # several jobs at once, but if you have a single core, delete this line:
 mk_add_options MOZ_MAKE_FLAGS="-j4"
@@ -170,7 +160,9 @@
     <para>Compile <application>Firefox</application> by issuing the
     following commands:</para>
 
-<screen><userinput>sed -i 's# ""##' browser/base/Makefile.in &&
+<screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' \
+  configure &&
+sed -i 's# ""##' browser/base/Makefile.in &&
 make -f client.mk</userinput></screen>
 
     <para>If you have <emphasis>not</emphasis> linked
@@ -213,8 +205,14 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i 's#VPX_CODEC_USE ...</command>: This fixes
+    <application>Firefox's</application> <command>configure</command>
+    script to properly detect libvpx-v1.0.0. It is not needed if you have
+    libvpx-v0.9.7 or earlier installed or if you've not installed
+    <xref linkend="libvpx"/>.</para>
+
     <para><command>sed -i 's# ""##' browser/base/Makefile.in</command>: This
-    removes an unprintable control character from the title bar.</para>
+    sed removes an unprintable control character from the title bar.</para>
 
     <para><command>make -f client.mk ...</command>: Mozilla products are
     packaged to allow the use of a configuration file which can be used to




More information about the blfs-book mailing list