Changeset fad1ab6 for xsoft/other/thunderbird.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/other/thunderbird.xml (modified) (8 diffs)

xsoft/other/thunderbird.xml

@@ -38 +38 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157 +157 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+# If you have a multicore machine, firefox will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
 
 # If you have installed DBus-Glib comment out this line:
@@ -231 +231 @@
 
     <para>
-      First, a bug needs to be fixed. Notice that thunderbuild needs to match
-      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
+      First, a bug needs to be fixed. Notice that thunderbuild matches
+      the value used in mozconfig (above) for the object directory
+      (MOZ_OBJDIR):
     </para>
 
@@ -242 +243 @@
     </para>
 
-    <note><para>
-      If you are compiling <application>Thunderbird</application> in chroot,
-      prepend <envar>SHELL=/bin/sh</envar> to the <!--first -->make command below.
-    </para></note>
-
-<screen><userinput>make -f client.mk<!--
-make -C thunderbuild/mail/installer--></userinput></screen>
+<screen><userinput>make -f client.mk</userinput></screen>
 
     <para>
@@ -258 +253 @@
       commands as the <systemitem class="username">root</systemitem> user:
     </para>
-
-<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
-tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
-ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
@@ -275 +265 @@
 
 <screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
-      of Makefile at the beginning of build, where a file cannot be found.
-    </para>
 
     <para>
@@ -354 +340 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -371 +356 @@
 EOF
 
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
+for s in 16 22 24 32 48 256
+do
+install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
+
     </sect3>
+
   </sect2>