Changeset bcc5446

Timestamp:

10/08/2014 05:19:19 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

a7620e7

Parents:

2f5cf5d6

Message:

Merged more updates from trunk.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• introduction/welcome/conventions.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (13 diffs)

introduction/welcome/changelog.xml

@@ -107 +107 @@
           <ulink url="&blfs-ticket-root;5626">#5626</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libreoffice-4.3.1.2.  Fixes
+          <ulink url="&blfs-ticket-root;5580">#5580</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Clarify meaning of Required, Recommended,
+          and Optional dependecies by adding the definitions used.
+          Added to 'Conventions Used in this Book'.  Fixes
+          <ulink url="&blfs-ticket-root;5624">#5624</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

introduction/welcome/conventions.xml

@@ -16 +16 @@
   <title>Conventions Used in this Book</title>
 
+  <sect2>
+  <title>Typographical Conventions</title>
   <para>To make things easy to follow, there are a number of conventions used
   throughout the book.  Following are some examples:</para>
@@ -88 +90 @@
   </blockquote>
 
+  </sect2>
+
+  <sect2>
+  <title>Conventions Used for Package Dependencies</title>
+
+    <para>When packages are created, the authors depend on prior work.  In
+    order to build a package in BLFS, these dependencies must be built prior to
+    the desired package.  For each package, any prerequsite packages are listed
+    in one or more separate sections:  Required, Recommended, and Optional.</para>
+
+    <bridgehead renderas="sect3">Required Dependencies</bridgehead>
+
+    <para>These dependencies are the minimum prerequsite packages required to
+    build the package.  Omitted from the list are packages in LFS and required
+    dependencies of other required packages.</para>
+
+    <bridgehead renderas="sect3">Recommended Dependencies</bridgehead>
+    
+    <para>These dependencies are those that the BLFS editors have determined
+    are important to give the package reasonable capabilities.  Ppackage
+    installation instructions assume thay are installed.  If a recommended
+    package is not desired, the instructions may need to be modified to
+    accomodate the missing package.</para>
+    
+    <bridgehead renderas="sect3">Optional Dependencies</bridgehead>
+
+    <para>These dependencies are those that the package may use.  Integration
+    of optional dependencies may be automatic by the package or may need
+    additional instructions not presented by BLFS.  Optional packages may be
+    listed without corresponding BLFS instructions.  In this case it is up to
+    the user to determine appropriate installation instructions. </para>
+
+  </sect2>
+
 </sect1>

packages.ent

@@ -578 +578 @@
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "4.3.1">
+<!ENTITY libreoffice-version          "4.3.2">
 <!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">

xsoft/office/libreoffice.xml

@@ -8 +8 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "cf750c01b6cd0b5c6fdd1760672e67d4">
+  <!ENTITY libreoffice-core-md5sum        "86aa9cad125fec16c5cd1d9d964e1d20">
   <!ENTITY libreoffice-core-size          "146 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "aae27f6c9db741c42acae48a1dfb0f5e">
+  <!ENTITY libreoffice-dict-md5sum        "996ec400156194fe26d24ffbccbc5b7a">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "24692bf69bbe877ad2524653c991705a">
+  <!ENTITY libreoffice-help-md5sum        "63a59a4c77a72856b47caf1871cfc48f">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "b8d3445100c10bb4f21f6c8f25c5c600">
+  <!ENTITY libreoffice-translations-md5sum        "0236e56349006fc8fec8e7df749c13b1">
   <!ENTITY libreoffice-translations-size          "121 MB">
 
@@ -28 +28 @@
   dependencies (with-system... -->
 
-  <!ENTITY libreoffice-buildsize          "8.1 GB (535 MB installed), with translations">
-  <!ENTITY libreoffice-time               "200 SBU, with translations">
+  <!ENTITY libreoffice-buildsize          "6.6 GB (570 MB installed), with translations">
+  <!ENTITY libreoffice-time               "61 SBU (using parallelism=4), with translations">
+
+  <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
+
   <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
   boundaries for x86_64 of previous versions, thus, temporarily, decided to use
@@ -202 +205 @@
       <xref linkend="npapi-sdk"/>,
       <xref linkend="nss"/>,
-      <xref linkend="openldap"/> (client only),
+      <xref linkend="openldap"/>,
       <xref linkend="openssl"/>,
       <xref linkend="poppler"/>,
-      <xref linkend="python3"/> (used to build the translations),
+      <xref linkend="python3"/>,
       <xref linkend="redland"/>, and
       <xref linkend="unixodbc"/>
@@ -289 +292 @@
     <note>
       <para>
-       It is recommended to build this package in a graphical environment,
-       because there have been reports of build failures, when using
+       Building this package in a graphical environment is recommended.
+       There have been reports of build failures, when using
        <command>chroot</command> or <command>ssh</command>.
       </para>
     </note>
 
-<screen role="root"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
+    <important>
+      <para>
+      Unlike the other packages, we suppose that you have not yet unpacked the
+      package. This is so because the <option>--no-overwrite-dir</option> switch
+      is needed in case you unpack as the
+      <systemitem class="username">root</systemitem> user.
+      </para>
+    </important>
+
+<screen><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
 cd libreoffice-&libreoffice-dlversion;</userinput></screen>
 
     <para>
       Unpack the dictionaries file and create symlinks to tarballs from the
-      source directory so they won't get downloaded again:
+      source directory so they won't get downloaded againi.  It is not necessary
+      to unpack the help nor the translations tarballs:
     </para>
 
@@ -312 +325 @@
 -->
 
+ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
+ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/</userinput></screen>
+
+<!-- Not necessary for this version
     <para>
       If you have downloaded the translations tarball, create a symlink:
     </para>
 
-<screen><userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz \
-       external/tarballs/</userinput></screen>
+<screen><userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <note>
@@ -323 +339 @@
         During the build process, some packages will be downloaded (including
         the ones listed as recommended and optional dependencies) if they are
-        not present on the system. Doing so, build time may be different
-        for everyone.
+        not present on the system. Because of this, build time may vary from the
+        published time more than usual.
       </para>
     </note>
@@ -335 +351 @@
 
     <para>
-     For i686 systems, fix a problem introduced by
-     <application>&gcc-490;</application>:
+      Due to the large size of the package, you may prefer to install it in
+      <filename class="directory">/opt</filename>, instead of
+      <filename class="directory">/usr</filename>. Depending on your choice,
+      replace <replaceable>&lt;PREFIX&gt;</replaceable> by
+      <filename class="directory">/usr</filename> or by
+      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
+    </para>
+
+<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
+
+    <para>
+     For i686 systems, fix a problem inroduced by <application>&gcc-490;</application>:
     </para>
 
@@ -354 +380 @@
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
-chmod -v +x bin/unpack-sources                     &amp;&amp;
+chmod -v +x bin/unpack-sources                       &amp;&amp;
+
 chmod -v +x bin/unpack-sources                     &amp;&amp;
 sed -e "s/target\.mk/langlist\.mk/"                \
     -e "s/tar -xf/tar -x --strip-components=1 -f/" \
     -e "/tar -x/s/lo_src_dir/start_dir/"           \
-    -i bin/unpack-sources                          &amp;&amp;
+    -i bin/unpack-sources                            &amp;&amp;
 
 ./autogen.sh --prefix=/usr               \
@@ -436 +463 @@
 cp -rv    dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
 
+    <para>
+       If installed in <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
+       and the icons in the new items of the desktop menu are not properly displayed,
+       optionally run the following commands, as
+       <systemitem class="username">root</systemitem> user (it may be necessary
+       to logout the session, before the icons appear):
+    </para>
+
+<screen role="root"><userinput>mkdir -pv /usr/share/pixmaps &amp;&amp;
+
+for i in writer base calc draw impress math startcenter writer
+do
+  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
+          /usr/share/pixmaps/
+done
+unset i</userinput></screen>
+
   </sect2>
 
@@ -442 +486 @@
 
     <para>
-      <command>sed -e ...</command>: First sed prevents compression of the
-      manual pages, the second one prevents a script that causes install to
-      fail from running, the third one fixes the unpack script.
+      <command>sed -e ...</command>: The first sed prevents compression of the
+      manual pages, the second one prevents install from failing, and
+      the third one fixes the unpack script.
     </para>
 
@@ -463 +507 @@
     </para>
 
-    <note>
-      <para>
-        For a list of the available languages, you can uncompress the
-        translations tarball by running the following command:
-        <command>tar -xf
-        ../libreoffice-translations-&libreoffice-dlversion;.tar.xz
-        --no-overwrite-dir -C /tmp</command> and proceed to examine
-        the contents of <filename
-        class="directory">/tmp/libreoffice-&libreoffice-dlversion;/translations/source</filename>.
-      </para>
-    </note>
+    <note><para>
+      For a list of the 117 available languages, you can look at the 
+      translations tarball: <command>tar -tf
+      ../libreoffice-translations-&libreoffice-dlversion;.tar.xz |
+      grep translations/source| cut -d/ -f4 | uniq</command>.
+    </para></note>
 
     <para>
@@ -525 +564 @@
       <application>LibreOffice</application> to use installed
       <application>Python 3</application> to build the translations
-      instead of the bundled one. If you don't need to build any
-      translations, you can use <option>--disable-python</option>
-      instead.
+      instead of the bundled one. 
     </para>
 
@@ -549 +586 @@
 
     <para>
+      <option>--disable-dbus</option>: Use this switch if you've not
+      installed D-Bus-1.8.0 or later. It also disables Bluetooth support and 
+      font install via PackageKit. 
+    </para>
+
+    <para>
+      <option>--disable-gstreamer-0-10</option>: Use this switch if you've
+      not installed <xref linkend="gst-plugins-base"/>.
+    </para>
+
+    <para>
       <option>--enable-gstreamer</option>: Use this switch if you want to
       use <xref linkend="gst10-plugins-base"/> instead of
       <xref linkend="gst-plugins-base"/> for the avmedia module.
-    </para>
-
-    <para>
-      <option>--enable-gtk3</option>: Use this switch if you want to
-      build the <application>GTK+ 3</application> integration module.
     </para>