[blfs-book] r11745 - in trunk/BOOK: . introduction/welcome xsoft/office

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Mon Sep 2 05:23:48 PDT 2013


Author: fernando
Date: Mon Sep  2 05:23:48 2013
New Revision: 11745

Log:
Update to LibreOffice-4.1.1. Instructions to optionally build in opt are restored

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/libreoffice.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Mon Sep  2 02:38:42 2013	(r11744)
+++ trunk/BOOK/general.ent	Mon Sep  2 05:23:48 2013	(r11745)
@@ -705,8 +705,8 @@
 <!ENTITY gnumeric-version             "1.12.5">
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "4.1.0">
-<!ENTITY libreoffice-patch            ".4">
+<!ENTITY libreoffice-version          "4.1.1">
+<!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">
 
 <!-- Chapter 35 -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Mon Sep  2 02:38:42 2013	(r11744)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Mon Sep  2 05:23:48 2013	(r11745)
@@ -48,6 +48,11 @@
       <para>September 2nd, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to LibreOffice-4.1.1. Instructions to
+          optionally build in /opt are restored. Fixes
+          <ulink url="&blfs-ticket-root;4016">#4016</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to giflib-5.0.5.  Fixes
           <ulink url="&blfs-ticket-root;4020">#4020</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml	Mon Sep  2 02:38:42 2013	(r11744)
+++ trunk/BOOK/xsoft/office/libreoffice.xml	Mon Sep  2 05:23:48 2013	(r11745)
@@ -7,23 +7,23 @@
   <!ENTITY libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "5311656e1b54eadd4b93f948dfd5e68e">
+  <!ENTITY libreoffice-core-md5sum        "4eb8fd2b0d1177d19b2f797faabc4ea2">
   <!ENTITY libreoffice-core-size          "117 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "2bbe7adab2b9bc0042c72ba60c30acc4">
+  <!ENTITY libreoffice-dict-md5sum        "482c3ba55f6062eaf49eb493200643c9">
   <!ENTITY libreoffice-dict-size          "35 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "e2cd3b63e3050771a1330fc98e41a701">
+  <!ENTITY libreoffice-help-md5sum        "f6b418a1ed94ef9d5ee30e9f5d7f305a">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "1f4438828cbcf83c257742482dade3ef">
-  <!ENTITY libreoffice-translations-size          "123 MB">
+  <!ENTITY libreoffice-translations-md5sum        "e8c69bdb55586531cc192904467f5e24">
+  <!ENTITY libreoffice-translations-size          "124 MB">
 
-  <!ENTITY libreoffice-buildsize          "6.1 GB (415 MB installed)">
-  <!ENTITY libreoffice-time               "80 SBU">
+  <!ENTITY libreoffice-buildsize          "7.8 GB (509 MB installed)">
+  <!ENTITY libreoffice-time               "173 SBU">
 ]>
 
 <sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;">
@@ -134,12 +134,6 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_poppler-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_neon-1.patch"/>
         </para>
       </listitem>
@@ -289,9 +283,15 @@
     <para>
       In the rest of the page, locales "en-US" and "pt-BR" are examples; the
       user will change them to suit his needs - you might want to read the
-      "Command Explanations", further below, before proceeding. Prepare
-      <application>LibreOffice</application> for compilation by running the
-      following commands:
+      "Command Explanations", further below, before proceeding. Due to the
+      large size of the package, the user may prefer to install in
+      <filename class="directory">/opt</filename>, instead of
+      <filename class="directory">/usr</filename>. In order to do that, replace
+      <filename class="directory">/usr</filename> by
+      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
+      in the rest of the page, except in the commands fixing the menu icons.
+      Prepare <application>LibreOffice</application> for compilation by running
+      the following commands:
     </para>
 
 <screen><userinput>sed -e "/gzip -f/d"   \
@@ -306,7 +306,6 @@
     -i bin/unpack-sources &&
 
 patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_neon-1.patch    &&
-patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_poppler-1.patch &&
 ./autogen.sh --prefix=/usr              \
              --sysconfdir=/etc          \
              --with-vendor="BLFS"       \
@@ -368,6 +367,25 @@
 mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &&
 cp -vR dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
 
+    <para>
+       In the following, do not replace
+       <filename class="directory">/usr</filename> by
+       <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>.
+       If the prefix used is <filename class="directory">/opt</filename> and
+       there are no icons in the new items of the desktop menu, 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 &&
+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>
 
   <sect2 role="commands">



More information about the blfs-book mailing list