Changeset fad1ab6 for xsoft/graphweb/firefox.xml

Timestamp:

08/24/2014 11:24:00 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

7dc1acac

Parents:

8aad3f2

Message:

More checks and fixes.

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

File:

• xsoft/graphweb/firefox.xml (modified) (8 diffs)

xsoft/graphweb/firefox.xml

@@ -40 +40 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -260 +260 @@
       commands:
     </para>
-
-    <note><para>
-      If you are compiling <application>Firefox</application> in chroot, prepend
-      <envar>SHELL=/bin/sh</envar> to the first make command below.
-    </para></note>
       
 <screen><userinput>make -f client.mk</userinput></screen>
@@ -272 +267 @@
     </para>
 
-<!--    <para>
-      If you have <emphasis>not</emphasis> linked
-      <application>Firefox</application> against an installed
-      <application>Xulrunner</application>:
-    </para>
-
-<screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
--->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user, if you
@@ -287 +274 @@
     </para>
 
-<!--<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
-mkdir  /usr/lib/firefox-&firefox-version; &amp;&amp;
-
-tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/firefox-&firefox-version; -\-strip-components=1 &amp;&amp;
-chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
-
-ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;-->
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
 
@@ -383 +362 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -400 +378 @@
 EOF
 
-ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
-        /usr/share/pixmaps/firefox.png</userinput></screen>
+for s in 16 32 48
+do
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+done &amp;&amp;
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
 
   </sect2>
@@ -411 +396 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -418 +403 @@
         </seg>
         <seg>
-          Numerous libraries, browser components, plugins, extensions, and
-          helper modules installed in
-          <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>
+          None
         </seg>
         <seg>
-          /usr/lib/firefox-&firefox-version;
+          /usr/lib/firefox-&firefox-version; and
+          /usr/lib/mozilla/plugins
         </seg>
       </seglistitem>