xulrunner-12.0

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9977 af4574ff-66df-0310-9fd7-8a98e5e911e0

x/lib/xulrunner.xml

@@ -76,16 +76,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch if you're using <application>GCC-4.7</application>:
-          <ulink url="&patch-root;/xulrunner-&xulrunner-version;_gcc-4.7-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -198,13 +188,17 @@ EOF</userinput></screen>
       commands:
     </para>
 
-<screen><userinput>patch -p1 &lt; ../xulrunner-&xulrunner-version;_gcc-4.7-1.patch &amp;&amp;
+<screen><userinput>sed -i '/fcntl.h/a#include &lt;unistd.h&gt;' \
-sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
+  ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc &amp;&amp;
-if pkg-config --atleast-version &nspr-version; nspr
+sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;' ipc/chromium/src/base/time_posix.cc &amp;&amp;
+make -f client.mk</userinput></screen>
+
+<!--
+if pkg-config -&#45;atleast-version &nspr-version; nspr
 then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
 else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
 fi &amp;&amp;
-make -f client.mk</userinput></screen>
+-->
 
     <para>
       This package does not come with a test suite.
@@ -215,7 +209,7 @@ make -f client.mk</userinput></screen>
     </para>
 
 <screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
-mkdir -p /usr/lib/mozilla &amp;&amp;
+mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
 rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
 chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-* &amp;&amp;
@@ -228,15 +222,17 @@ done</userinput></screen>
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...</command>: This fixes
+      <command>sed -i '/fcntl.h/a#include &lt;unistd.h&gt;'
-      <application>Xulrunner's</application> <command>configure</command>
+      ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc
-      script to properly detect <xref linkend="libvpx"/>. It is not needed if
+      &amp;&amp; sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;'
-      you have libvpx-v0.9.7 or earlier installed or if you've not installed
+      ipc/chromium/src/base/time_posix.cc</command>: These seds fix bugs that
-      <application>Libvpx</application>.
+      would otherwise break the build if you're using
+      <application>GCC 4.7</application>.
     </para>
 
+    <!-- is this sed nstill needed?
     <para>
-      <command>if pkg-config --atleast-version &nspr-version; nspr;
+      <command>if pkg-config -&#45;atleast-version &nspr-version; nspr;
       then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;'
       xulrunner/installer/libxul-embedding.pc.in;
       else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;'
@@ -247,7 +243,7 @@ done</userinput></screen>
       to <filename>libxul-embedding.pc</filename>. If you try to build some
       other applications without this, the prtypes header from NSPR will not be
       found.
-    </para>
+    </para> -->
 
     <para>
       <command>make -f client.mk ...</command>: Mozilla products are packaged to
@@ -286,7 +282,7 @@ done</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>xulrunner, and optionally nspr-config</seg>
+        <seg>xulrunner</seg>
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename
         class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename></seg>

xsoft/graphweb/firefox.xml

@@ -73,16 +73,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch if you're using <application>GCC-4.7</application>:
-          <ulink url="&patch-root;/firefox-&firefox-version;_gcc-4.7-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>