Changeset a949fa4

Timestamp:

04/22/2012 06:28:16 PM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

1412d23b

Parents:

9e069685

Message:

xulrunner-12.0

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

Files:

• x/lib/xulrunner.xml (modified) (6 diffs)
• xsoft/graphweb/firefox.xml (modified) (1 diff)

x/lib/xulrunner.xml

@@ -73 +73 @@
         <para>
           Estimated build time: &xulrunner-time;
-        </para>
-      </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>
@@ -199 +189 @@
     </para>
 
-<screen><userinput>patch -p1 &lt; ../xulrunner-&xulrunner-version;_gcc-4.7-1.patch &amp;&amp;
-sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
-if pkg-config --atleast-version &nspr-version; nspr
+<screen><userinput>sed -i '/fcntl.h/a#include &lt;unistd.h&gt;' \
+  ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc &amp;&amp;
+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>
@@ -216 +210 @@
 
 <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;
@@ -229 +223 @@
 
     <para>
-      <command>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...</command>: This fixes
-      <application>Xulrunner's</application> <command>configure</command>
-      script to properly detect <xref linkend="libvpx"/>. It is not needed if
-      you have libvpx-v0.9.7 or earlier installed or if you've not installed
-      <application>Libvpx</application>.
-    </para>
-
-    <para>
-      <command>if pkg-config --atleast-version &nspr-version; nspr;
+      <command>sed -i '/fcntl.h/a#include &lt;unistd.h&gt;'
+      ipc/chromium/src/base/{file_util_linux,message_pump_libevent}.cc
+      &amp;&amp; sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;'
+      ipc/chromium/src/base/time_posix.cc</command>: These seds fix bugs that
+      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 -&#45;atleast-version &nspr-version; nspr;
       then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;'
       xulrunner/installer/libxul-embedding.pc.in;
@@ -248 +244 @@
       other applications without this, the prtypes header from NSPR will not be
       found.
-    </para>
+    </para> -->
 
     <para>
@@ -287 +283 @@
 
       <seglistitem>
-        <seg>xulrunner, and optionally nspr-config</seg>
+        <seg>xulrunner</seg>
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename

xsoft/graphweb/firefox.xml

@@ -70 +70 @@
         <para>
           Estimated build time: &firefox-time;
-        </para>
-      </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>