[blfs-book] r10201 - in trunk/BOOK: . introduction/welcome x/lib

[bdubbs]

Author: bdubbs
Date: 2012-05-13 12:49:25 -0600 (Sun, 13 May 2012)
New Revision: 10201

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/x/lib/xulrunner.xml
Log:
 Restore xulrunner

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-05-13 18:39:20 UTC (rev 10200)
+++ trunk/BOOK/general.ent      2012-05-13 18:49:25 UTC (rev 10201)
@@ -650,7 +650,7 @@
 <!ENTITY shared-mime-info-version     "1.0">
 <!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">
 <!ENTITY qt-dir                       "$QTDIR">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-05-13 18:39:20 UTC 
(rev 10200)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-05-13 18:49:25 UTC 
(rev 10201)
@@ -46,6 +46,9 @@
       <para>May 13th, 2012</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Restore xulrunner.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Fixed libdrm dependencies.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/x/lib/lib.xml
===================================================================
--- trunk/BOOK/x/lib/lib.xml    2012-05-13 18:39:20 UTC (rev 10200)
+++ trunk/BOOK/x/lib/lib.xml    2012-05-13 18:49:25 UTC (rev 10201)
@@ -54,6 +54,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="shared-mime-info.xml"/>
   <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>

Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml      2012-05-13 18:39:20 UTC (rev 10200)
+++ trunk/BOOK/x/lib/xulrunner.xml      2012-05-13 18:49:25 UTC (rev 10201)
@@ -179,7 +179,8 @@
     </para>
 
 <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>
 
@@ -198,13 +199,14 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </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>
 

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page