Changeset f853c30e for xsoft

Timestamp:

11/04/2020 04:18:17 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

c466b88

Parents:

1a742391

Message:

Update to php-7.4.12
Update to Wireshark-3.4.0
Update to libreoffice-7.0.3.1 (including fixes for system ICU)
Update to icewm-1.9.0
Update to libhandy-1.0.1
Update to pipewire-0.3.15
Update to gdm-3.38.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23865 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        "48e541f6c5579059042ba5f94d88838d">
-  <!ENTITY libreoffice-core-size          "225 MB">
+  <!ENTITY libreoffice-core-md5sum        "7c07d445c7588c7ada6f6074a1bbc4c6">
+  <!ENTITY libreoffice-core-size          "230 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "48d39cebf26cce82356c6e6e5d705d58">
-  <!ENTITY libreoffice-dict-size          "44 MB">
+  <!ENTITY libreoffice-dict-md5sum        "55ab3088c7c97715440cb69ebda28fe8">
+  <!ENTITY libreoffice-dict-size          "46 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "0aa6799ff8fbbdbf0de8c050b4f44043">
+  <!ENTITY libreoffice-help-md5sum        "d486db827394ff5bcafebf9b1d563910">
   <!ENTITY libreoffice-help-size          "106 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "d267b08913b3b738b90ea8903f2f3e5d">
+  <!ENTITY libreoffice-translations-md5sum        "0512dc56db2697c5c0e843947958ba96">
   <!ENTITY libreoffice-translations-size          "168 MB">
 
   <!-- full size remeasured for 7.0.0.3 -->
 
-  <!ENTITY libreoffice-buildsize  "6.5 GB including the additional files if downloaded during the build (775 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
+  <!ENTITY libreoffice-buildsize  "9.0 GB including the additional files if downloaded during the build (823 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
 
  <!-- Editors: many updates to poppler will break LO using system poppler until
@@ -45 +45 @@
        60 SBU not including download of translations, help and dictionary
        for 6.4.6.2 - pierre
+
+       56 SBU for 7.0.3.1 not including download of translations, help, and
+       dictionaries. -renodr
   -->
-  <!ENTITY libreoffice-time "46 SBU with parallelism=4 including typical download time">
+  <!ENTITY libreoffice-time "56 SBU with parallelism=4 including typical download time">
 
 ]>
@@ -272 +275 @@
       <ulink url="https://github.com/behdad/glyphy">glyphy</ulink>,
       <ulink url="http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/">Gnome VFS</ulink>,
-
       <ulink url="https://github.com/hamcrest/JavaHamcrest/releases">hamcrest</ulink>,
       <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
@@ -293 +295 @@
       <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
       <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
-      <ulink url="http://libwps.sourceforge.net/">libwps</ulink>,
+      <ulink url="https://sourceforge.net/p/libwps/wiki/Home/">libwps</ulink>,
       <ulink url="http://lpsolve.sourceforge.net/">lp_solve</ulink>,
       <ulink url="https://gitlab.com/mdds/mdds">mdds</ulink>,
@@ -378 +380 @@
     </para>
 
-<!-- when system-icu works:
-             \-\-with-system-icu           \ -->
+<!-- For the ICU seds, the spacing here is intentional. Sed will return syntax
+     errors otherise -->
 
 <screen><userinput>sed -e "/gzip -f/d"   \
@@ -389 +391 @@
 sed -e 's@getURI()->c_str()@getURI().c_str()@' \
     -i sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx &amp;&amp;
+
+sed -i 29a\
+'\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' \
+external/libcdr/ExternalProject_libcdr.mk &amp;&amp;
+
+sed -i 30a\
+'\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' \
+external/libebook/ExternalProject_libebook.mk &amp;&amp;
+
+sed -i 's/TRUE/true/' i18npool/source/calendar/calendar_gregorian.cxx &amp;&amp;
 
 ./autogen.sh --prefix=$LO_PREFIX         \
@@ -413 +425 @@
              --with-system-graphite      \
              --with-system-harfbuzz      \
+             --with-system-icu           \
              --with-system-jpeg          \
              --with-system-lcms2         \
@@ -453 +466 @@
        If installed in <filename
        class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-       some additional steps are necessary. Issue the following commands, as
+       some additional steps are necessary. Issue the following commands as the
        <systemitem class="username">root</systemitem> user:
     </para>
@@ -501 +514 @@
       using their shell starting script names (see "Installed Programs", below), 
       if LO_PREFIX is other than <filename class='directory'>/usr</filename>,
-      unless <filename class='directory'>$LO_PREFIX/bin</filename> directory is
-      appended to the PATH.
+      unless the <filename class='directory'>$LO_PREFIX/bin</filename> directory
+      is appended to the PATH.
     </para>
 
@@ -584 +597 @@
 
     <para>
-      <parameter>--without-system-dicts</parameter>: This switch disables use
-      of  dictionaries from system paths, so the ones installed by this package
-      are used.
+      <parameter>--without-system-dicts</parameter>: This switch disables the 
+      use of dictionaries from system paths so that the ones installed by this 
+      package are used.
     </para>