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

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Tue Dec 10 12:45:52 PST 2013


Author: fernando
Date: Tue Dec 10 12:45:52 2013
New Revision: 12366

Log:
Update to xulrunner-26.0 and firefox-26.0 linked to xulrunner.

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

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Tue Dec 10 12:25:27 2013	(r12365)
+++ trunk/BOOK/general.ent	Tue Dec 10 12:45:52 2013	(r12366)
@@ -567,7 +567,7 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
 <!ENTITY webkitgtk2-version           "2.2.3">    <!-- Even minors only -->
-<!ENTITY xulrunner-version            "25.0.1">
+<!ENTITY xulrunner-version            "26.0">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
 <!ENTITY qt4-dir                      "$QTDIR">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Tue Dec 10 12:25:27 2013	(r12365)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Tue Dec 10 12:45:52 2013	(r12366)
@@ -47,6 +47,11 @@
       <para>December 10th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to xulrunner-26.0 and firefox-26.0 linked
+          to xulrunner. Partially fix
+          <ulink url="&blfs-ticket-root;4435">#4435</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to NSS-3.15.3.1. Fixes
           <ulink url="&blfs-ticket-root;4438">#4438</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/x/lib/xulrunner.xml
==============================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	Tue Dec 10 12:25:27 2013	(r12365)
+++ trunk/BOOK/x/lib/xulrunner.xml	Tue Dec 10 12:45:52 2013	(r12366)
@@ -8,10 +8,10 @@
            "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">
-  <!ENTITY xulrunner-md5sum        "b5b57d3ea937a339e0ed7ebea604b430">
+  <!ENTITY xulrunner-md5sum        "91ce51cc6474f1269484e5327643a59c">
   <!ENTITY xulrunner-size          "122 MB">
-  <!ENTITY xulrunner-buildsize     "4.2 GB (90 MB installed)">
-  <!ENTITY xulrunner-time          "56 SBU">
+  <!ENTITY xulrunner-buildsize     "3.7 GB (92 MB installed)">
+  <!ENTITY xulrunner-time          "62 SBU">
 ]>
 
 <sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;">
@@ -75,16 +75,6 @@
       </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>
@@ -232,8 +222,7 @@
       prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
     </para></note>
 
-<screen><userinput>patch -Np1 -i ../xulrunner-&xulrunner-version;-freetype-1.patch && 
-make -f client.mk</userinput></screen>
+<screen><userinput>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	Tue Dec 10 12:25:27 2013	(r12365)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	Tue Dec 10 12:45:52 2013	(r12366)
@@ -8,10 +8,10 @@
            "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        "b5b57d3ea937a339e0ed7ebea604b430">
+  <!ENTITY firefox-md5sum        "91ce51cc6474f1269484e5327643a59c">
   <!ENTITY firefox-size          "122 MB">
-  <!ENTITY firefox-buildsize     "4.4 GB (51 MB installed) (or 835 MB and 4.8 MB if using Xulrunner)">
-  <!ENTITY firefox-time          "55 SBU (0.3 SBU if using Xulrunner)">
+  <!ENTITY firefox-buildsize     "4.4 GB (51 MB installed) (or 825 MB and 5.0 MB if using Xulrunner)">
+  <!ENTITY firefox-time          "55 SBU (0.4 SBU if using Xulrunner)">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -72,16 +72,6 @@
       </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>
@@ -245,8 +235,7 @@
       <envar>SHELL=/bin/bash</envar> to the first make command below.
     </para></note>
       
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-freetype-1.patch &&
-sed -i 's@ ""@@' browser/base/Makefile.in &&
+<screen><userinput>sed -i 's@ ""@@' browser/base/Makefile.in &&
 make -f client.mk</userinput></screen>
 
     <para>



More information about the blfs-book mailing list