Changeset 5153eb9 for xsoft

Timestamp:

08/31/2014 02:12:19 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2dc8feb

Parents:

a508099

Message:

Update to libreoffice-4.3.1.2.
Completely modify and fix instructions for alsa-tools-1.0.28.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14144 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• xsoft/office/libreoffice.xml (modified) (10 diffs)

xsoft/office/libreoffice.xml

@@ -8 +8 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "de0d9322f3aaeb20abd5e06c5c0972bb">
-  <!ENTITY libreoffice-core-size          "145 MB">
+  <!ENTITY libreoffice-core-md5sum        "cf750c01b6cd0b5c6fdd1760672e67d4">
+  <!ENTITY libreoffice-core-size          "146 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "cd27ec060c68079a13abf0984dbbf5fa">
+  <!ENTITY libreoffice-dict-md5sum        "aae27f6c9db741c42acae48a1dfb0f5e">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "89d9da0ff2d5ea07f8c30c680fee2b0a">
+  <!ENTITY libreoffice-help-md5sum        "24692bf69bbe877ad2524653c991705a">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "8e2f7905a0f827f655a1e21d93c6ddf7">
+  <!ENTITY libreoffice-translations-md5sum        "b8d3445100c10bb4f21f6c8f25c5c600">
   <!ENTITY libreoffice-translations-size          "121 MB">
 
@@ -28 +28 @@
   dependencies (with-system... -->
 
-  <!ENTITY libreoffice-buildsize          "8.23 GB (497 MB installed) - 9.6 GB (528 MB installed), with translations">
-  <!ENTITY libreoffice-time               "144 SBU - 165 SBU, with translations">
+  <!ENTITY libreoffice-buildsize          "8.1 GB (497 MB installed) - 9.6 GB (528 MB installed), with translations">
+  <!ENTITY libreoffice-time               "200 SBU, with translations">
+  <!-- [fo] For version 4.3.1.2 I've got, for i686, SBU larger than the upper
+  limit, thus, temporarily, decided to used a single SBU, instead of a range.
+  -->
   <!-- This package has some peculiarities, some discussed in the text.
   Two values for SBU and buildsize are given due to the large difference
@@ -135 +138 @@
         <para>
           Translations size: &libreoffice-translations-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch for to fix building with system Boost:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
         </para>
       </listitem>
@@ -167 +176 @@
 
     <para role="recommended">
-    <!--<xref linkend="boost"/>,-->
+      <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -251 +260 @@
   <sect2 role="installation">
     <title>Installation of LibreOffice</title>
-
+<!--
     <warning>
       <para>
@@ -271 +280 @@
         <systemitem class="username">root</systemitem>. If you must untar it as
         <systemitem class="username">root</systemitem> pass the option
-        <option>--no-overwrite-dir</option> to tar. This is the default when you
+        <option>-\-no-overwrite-dir</option> to tar. This is the default when you
         untar as a user but has to be passed as an option when untaring as
         <systemitem class="username">root</systemitem>:
       </para>
-    </warning>
+    </warning>-->
 
 <screen role="root"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
@@ -310 +319 @@
     </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>
@@ -350 +359 @@
     </para>
 
-<screen><userinput>sed -e "/gzip -f/d"   \
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &amp;&amp;
+
+sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
     -i bin/distro-install-desktop-integration        &amp;&amp;
+
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
-
-sed -e "/distro-install-file-lists/d"           \
-    -e "s:fetch_Download_item:&amp;_unchecked:" \
-    -e "/fetch_Download_item/s:,no-check::"     \
-   -i Makefile.in                                  &amp;&amp;
 
 chmod -v +x bin/unpack-sources                     &amp;&amp;
@@ -377 +384 @@
              --disable-postgresql-sdbc   \
              --enable-release-build=yes  \
-             --enable-python=system      \<!--
-             - -with-system-boost    \ --> 
+             --enable-python=system      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \
@@ -458 +465 @@
       <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 download location and the
-      fourth one fixes the unpack script.
+      fail from running, the third one fixes the unpack script.
     </para>