Changeset a4857b3

Timestamp:

05/13/2012 06:49:25 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

6c17af3

Parents:

d32716b

Message:

Restore xulrunner

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/lib.xml (modified) (1 diff)
• x/lib/xulrunner.xml (modified) (2 diffs)

general.ent

@@ -651 +651 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.8.1">
-<!-- <!ENTITY xulrunner-version            "12.0"> -->
+<!ENTITY xulrunner-version            "12.0"> 
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Restore xulrunner.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Fixed libdrm dependencies.</para>
         </listitem>

x/lib/lib.xml

@@ -55 +55 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/> 
 
 </chapter>

x/lib/xulrunner.xml

@@ -180 +180 @@
 
 <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;
+  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>
@@ -199 +200 @@
     </para>
 
-<screen role="root"><userinput>make -C xulrunner-build-dir install &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;
-for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.so
-do ln -sfv ${library#/usr/lib/} /usr${library#*sdk}
+<screen role="root"><userinput>make -C xulrunner-build-dir install                                &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;
+
+for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.so; do 
+   ln -sfv ${library#/usr/lib/} /usr${library#*sdk}
 done</userinput></screen>
   </sect2>