Changeset 9527e96

Timestamp:

08/25/2014 12:18:31 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

a22ed6c6

Parents:

1e667c6

Message:

Send xulrunner to retirement.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14058 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• archive/xulrunner.xml (moved) (moved from x/lib/xulrunner.xml )
• general/prog/python2.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/gtk-vnc-systemd.xml (modified) (1 diff)
• x/lib/lib.xml (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (12 diffs)
• xsoft/other/thunderbird.xml (modified) (2 diffs)

general/prog/python2.xml

@@ -134 +134 @@
         <!-- new for ff31.  Any reasonable version of openssl will do,
         even old maintained versions, so do not xref openssl here -->
-        If you are building <xref linkend="thunderbird"/>,
-        <xref linkend="firefox"/> or <xref linkend="xulrunner"/>,
-        you must install <application>openssl</application> before you build
+        If you are building <xref linkend="thunderbird"/> or
+        <xref linkend="firefox"/><!-- or <xref linkend="xulrunner"/> -->,
+        you must install <application>OpenSSL</application> before you build
         <application>Python 2</application>.
       </para>

introduction/welcome/changelog.xml

@@ -65 +65 @@
         <listitem>
           <para>[ken] - Make TeX Live use system gc for asymptote.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Archived Xulrunner-31.0.</para>
         </listitem>
         <listitem>

x/lib/gtk-vnc-systemd.xml

@@ -88 +88 @@
     <para role="optional">
       <xref linkend="cyrus-sasl"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="xulrunner"/>
+      <xref linkend="nspr"/>, and
+      <xref linkend="pulseaudio"/><!--, and
+      <xref linkend="xulrunner"/> -->
     </para>
 

x/lib/lib.xml

@@ -61 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
 
 </chapter>

xsoft/graphweb/firefox.xml

@@ -5 +5 @@
   %general-entities;
 
-<!--  <!ENTITY firefox-download-http
-           "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">-->
   <!ENTITY firefox-download-http
            "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
@@ -82 +80 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/>, and
-      <xref linkend="unzip"/>
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
     </para>
 
@@ -110 +108 @@
       <para>
         With <application>Firefox-31.0</application> and later versions, you
-        must have installed <application>Openssl</application> before
+        must have installed <application>OpenSSL</application> before
         <application>Python 2</application>, or the build system will quickly
         fail with output including "ImportError: cannot import name
@@ -135 +133 @@
       <xref linkend="gst10-plugins-good"/> and
       <xref linkend="gst10-libav"/> at runtime),
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
       <xref linkend="libnotify"/>,
       <xref linkend="openjdk"/>,
@@ -142 +139 @@
       <xref linkend="wget"/>,
       <xref linkend="wireless_tools"/> and
-      <xref linkend="xulrunner"/>
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
+      <!-- <xref linkend="xulrunner"/> -->
     </para>
 
@@ -153 +151 @@
     <title>Installation of Firefox</title>
 
-    <para>
+    <!-- <para>
       There are two major methods for building
       <application>Firefox</application>. In the standard case, the entire suite
@@ -163 +161 @@
       <filename>mozconfig</filename> file. Then use the appropriate install
       instructions depending on the chosen build method.
-    </para>
+    </para> -->
 
     <para>
@@ -209 +207 @@
 # If you have not installed Yasm then uncomment this line:
 #ac_add_options --disable-webm
-
+<!--
 # If you have installed xulrunner uncomment the next two ac_add_options lines
 # and check that the sdk will be set by running pkg-config in a subshell
 # and has not become hardcoded or empty when you created this file
-#ac_add_options --with-system-libxul
-#ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
-
+#ac_add_options -\-with-system-libxul
+#ac_add_options -\-with-libxul-sdk=$(pkg-config -\-variable=sdkdir libxul)
+-->
 # Comment out following options if you have not installed
 # recommended dependencies:
@@ -267 +265 @@
     </para>
 
-    <para>
+    <!-- <para>
       Now, as the <systemitem class="username">root</systemitem> user, if you
       have <emphasis>not</emphasis> linked <application>Firefox</application>
       against an installed <application>Xulrunner</application>, install the
       package:
+    </para> -->
+
+    <para>
+      Install <application>Firefox</application> by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -280 +283 @@
 
     <para>
+      The above instruction just installs the parts you need to run
+      <application>Firefox</application>. Alternatively, if you want to
+      install the full <application>Firefox</application> development
+      environment, run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
+
+    <!-- <para>
       If you <emphasis>have</emphasis> linked against an already installed
       <application>Xulrunner</application>, as the
@@ -290 +303 @@
 
 mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
+ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen> -->
 
   </sect2>
@@ -305 +318 @@
     </para>
 
-     <para>
-      <command>make -C firefox-build-dir install</command>: This runs
-      <command>make install</command> in firefox-build-dir.
-    </para>
-
-    <para>
+    <!-- <para>
       <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic link
       to the <command>firefox</command> executable in your <envar>PATH</envar>
       variable.
-    </para>
-
-    <para>
-      <command>mkdir -p /usr/lib/mozilla/plugins</command>: This checks
-      that <filename class="directory">/usr/lib/mozilla/plugins</filename>
-      exists.
-    </para>
+    </para> -->
 
     <para>

xsoft/other/thunderbird.xml

@@ -80 +80 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/> and
-      <xref linkend="unzip"/>
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
     </para>
 
@@ -127 +127 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
+      <xref linkend="gst-plugins-base"/> (with
       <xref linkend="gst-plugins-good"/> and
-      <xref linkend="gst-ffmpeg"/>,
+      <xref linkend="gst-ffmpeg"/> at runtime), or
+      <xref linkend="gst10-plugins-base"/> (with
+      <xref linkend="gst10-plugins-good"/> and
+      <xref linkend="gst10-libav"/> at runtime),
       <xref linkend="libnotify"/>,
       <xref linkend="openjdk"/>,