linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 14:47:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to libreoffice-6.1.4.2

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20971 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2019-01-13 21:17:09 +00:00
parent 6ba8d3c869
commit 5cc300f315
3 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
introduction/welcome/changelog.xml
View File

@ -45,6 +45,10 @@
<listitem>
<para>January 13th, 2019</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to libreoffice-6.1.4.2. Fixes
<ulink url="&blfs-ticket-root;11180">#11180</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Fix the W3M patch so that it builds with GC
8.0.x.</para>

4
packages.ent
View File

@ -844,8 +844,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY gnumeric-version "1.12.44">
<!ENTITY gnucash-version "2.4.11">
<!ENTITY libreoffice-version "6.1.2">
<!ENTITY libreoffice-patch ".1">
<!ENTITY libreoffice-version "6.1.4">
<!ENTITY libreoffice-patch ".2">
<!ENTITY libreoffice-dlversion "&libreoffice-version;&libreoffice-patch;">
<!-- Chapter 43 -->

47
xsoft/office/libreoffice.xml
View File

@ -7,31 +7,32 @@
<!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 "b8d746b56e39b1926e61a4ede7c71891">
<!ENTITY libreoffice-core-md5sum "f6e69df90d8d6de6dd223d5309f71caa">
<!ENTITY libreoffice-core-size "198 MB">
<!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
<!ENTITY libreoffice-dict-md5sum "d0b075239e5c628cc53eff999ea78868">
<!ENTITY libreoffice-dict-size "41 MB">
<!ENTITY libreoffice-dict-md5sum "e5bb56a92b72c3102f4917aafebba3b4">
<!ENTITY libreoffice-dict-size "42 MB">
<!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
<!ENTITY libreoffice-help-md5sum "383c63275294891f33da9b7d326671ee">
<!ENTITY libreoffice-help-md5sum "e02680a25ab4f5eee112170f20bf47d0">
<!ENTITY libreoffice-help-size "16 MB">
<!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
<!ENTITY libreoffice-translations-md5sum "2937eac11d5ac8f1a5d4c3f5920904ab">
<!ENTITY libreoffice-translations-md5sum "8c99e7da7bfc9515f5d074ca7449471b">
<!ENTITY libreoffice-translations-size "135 MB">
<!-- full size still accurate for 6.0.2, reconfiguring and rebuilding
the built source after initial DESTDIR install doesn't take a vast time -->
<!ENTITY libreoffice-buildsize "6.2 GB (746 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
<!ENTITY libreoffice-buildsize "6.4 GB (756 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
<!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was
64.76 SBU with fast downloads
for 6.1.4.2 I just used the total time - bdubbs
-->
<!ENTITY libreoffice-time "64 SBU with parallelism=4 + download time">
<!ENTITY libreoffice-time "63 SBU with parallelism=4 including typical download time">
]>
@ -150,16 +151,8 @@
<listitem>
<para>
Required patch to fix building with system <xref linkend="poppler"/> (all
recent versions):
<ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler70-1.patch"/>
</para>
</listitem>
<listitem>
<para>
Required patch to fix building with system <xref linkend="poppler"/>
(only if using that version or a later version):
<ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler71-1.patch"/>
recent versions) and <xref linkend="boost"/>:
<ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch"/>
</para>
</listitem>
@ -303,6 +296,14 @@
<screen><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
cd libreoffice-&libreoffice-dlversion;</userinput></screen>
<!-- keep a commented instruction if no patches are currently required -->
<para> <!-- for all recent versions -->
Fix build failures introduced by recent versions of <xref linkend="poppler"/>
and <xref linkend="boost"/>:
</para>
<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
<para>
Create symlinks to tarballs from the source directory so they won't
get downloaded again:
@ -337,18 +338,6 @@ ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external
</para>
<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
<!-- keep a commented instruction if no patches are currently required -->
<para> <!-- for all recent versions -->
Fix build failures introduced by recent versions of <xref linkend="poppler"/>:
</para>
<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler70-1.patch</userinput></screen>
<para> <!-- for 0.71.0, not tested on earlier versions -->
Similarly, fix build failures introduced with <xref linkend="poppler"/>:
</para>
<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler71-1.patch</userinput></screen>
<para>
Locales "fr" and "en-GB", you will find below, are just examples; you