Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/libreoffice.xml

    r9c9beb8 r5e5d8c4  
    55  %general-entities;
    66
    7   <!ENTITY libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
     7  <!ENTITY libreoffice-dl "https://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "cad93ef2c87928b5a2971ae7e6474fe1">
    11   <!ENTITY libreoffice-core-size          "226 MB">
     10  <!ENTITY libreoffice-core-md5sum        "a4f2e92dc6829d556156ec7a13a965b8">
     11  <!ENTITY libreoffice-core-size          "241 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "f55125ef3ec0541df31c87ee2fa00700">
    15   <!ENTITY libreoffice-dict-size          "44 MB">
     14  <!ENTITY libreoffice-dict-md5sum        "885d9cb74978ac389d007a44c63f9fe9">
     15  <!ENTITY libreoffice-dict-size          "48 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "3862b85f1dd0e7daf2e02484e3839e72">
    19   <!ENTITY libreoffice-help-size          "106 MB">
     18  <!ENTITY libreoffice-help-md5sum        "92f52be4258eb3a5e409f02a99401826">
     19  <!ENTITY libreoffice-help-size          "107 MB">
    2020
    2121  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
    22   <!ENTITY libreoffice-translations-md5sum        "05aa6fbbec0cc08005ff6dca32cb4c40">
    23   <!ENTITY libreoffice-translations-size          "168 MB">
     22  <!ENTITY libreoffice-translations-md5sum        "702e9c5ad967830ab1cc72a93dffb61a">
     23  <!ENTITY libreoffice-translations-size          "184 MB">
    2424
    2525  <!-- full size remeasured for 7.0.0.3 -->
    2626
    27   <!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)">
     27  <!ENTITY libreoffice-buildsize  "7.1 GB including the additional files if downloaded during the build (793 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
    2828
    2929 <!-- Editors: many updates to poppler will break LO using system poppler until
    … …  
    3333      optional according to whether or not we use the system version.  The
    3434      installed size will be increased by 2 MB if using the shipped poppler, but
    35       the variation in build times will be lost in the noise. - ken -->
     35      the variation in build times will be lost in the noise. - ken
     36
     37      Not a problem with 7.1.7.2 and poppler-21.05.0.  - bdubbs
     38
     39  -->
    3640
    3741  <!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was
    … …  
    4953       dictionaries. -renodr
    5054  -->
    51   <!ENTITY libreoffice-time "45 SBU with parallelism=4 including typical download time">
     55  <!ENTITY libreoffice-time "69 SBU with parallelism=4 plus download time">
    5256
    5357]>
    … …  
    5761
    5862  <sect1info>
    59     <othername>$LastChangedBy$</othername>
    6063    <date>$Date$</date>
    6164  </sect1info>
    … …  
    7679    </para>
    7780
    78     &lfs10_checked;
     81    &lfs110a_checked;
    7982
    8083    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    112115      <para>
    113116        Around 80 smallish tarballs and zip files will be downloaded during the
    114         build. If you have not downloaded one or more of the following, they too
     117        build. The download time will vary with the local internet speed and
     118        server load.  The download time will probably be between 30 and 60 minutes.
     119        If you have not downloaded one or more of the following, they too
    115120        will also be downloaded during the build.
    116121      </para>
    … …  
    172177      </listitem>
    173178
    174 
    175 <!-- keep one commented patch, it's sure to again need one or more in a few months:
    176 -->
    177 <!--
    178       <listitem>
    179         <para>
    180           Required patch to fix building with GCC 10 and later:
    181           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-format_overflow-1.patch"/>
    182         </para>
    183       </listitem>
    184 -->
     179<!-- keep one commented patch, it's sure to again need one or more in a few months: -->
     180
     181      <listitem>
     182        <para>
     183          Required patch to fix building with <xref linkend="freetype2"/>:
     184          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-freetype_fix-1.patch"/>
     185        </para>
     186      </listitem>
     187
    185188    </itemizedlist>
    186189    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
    … …  
    242245    </para>
    243246
    244 
    245247    <bridgehead renderas="sect4">Optional</bridgehead>
    246248    <para role="optional">
    … …  
    253255      <xref linkend="gdb"/>,
    254256      <xref linkend="gnutls"/>,
    255 <!-- not anymore in the book, but included in apache-ant
    256      <xref linkend="junit"/>, -->
    257257      <xref linkend="kf5-frameworks"/>,
    258258      <xref linkend="libpaper"/>,
    … …  
    269269      <ulink url="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</ulink>,
    270270      <ulink url="https://commons.apache.org/proper/commons-logging/">Apache Commons Logging</ulink>,
    271       <ulink url="http://www.beanshell.org/">BeanShell</ulink>,
     271      <ulink url="https://beanshell.github.io/">BeanShell</ulink>,
     272      <ulink url="https://box2d.org/documentation/">box2d</ulink>,
    272273      <ulink url="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
    273       <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
     274      <ulink url="https://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
    274275      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
    275276      <ulink url="https://github.com/behdad/glyphy">glyphy</ulink>,
    … …  
    277278      <ulink url="https://github.com/hamcrest/JavaHamcrest/releases">hamcrest</ulink>,
    278279      <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
    279       <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
     280      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
    280281      <ulink url="http://include-what-you-use.org/">iwyu</ulink>,
    281282      <ulink url="https://github.com/junit-team/junit4/releases">junit4</ulink>,
    282283      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
    283284      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
    284       <ulink url="http://sourceforge.net/projects/libcmis/">libcmis</ulink>,
     285      <ulink url="https://sourceforge.net/projects/libcmis/">libcmis</ulink>,
    285286      <ulink url="http://www.sourceforge.net/projects/libebook/">libebook</ulink>,
     287      <ulink url="https://sourceforge.net/projects/libepubgen/">libepubgen</ulink>,
     288      <ulink url="https://wiki.documentfoundation.org/DLP/libraries/libetonyek">libetonyek</ulink>,
    286289      <ulink url="https://wiki.documentfoundation.org/Libexttextcat">libexttextcat</ulink>,
    287290      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>,
    288291      <ulink url="http://tagoh.github.io/liblangtag/">liblangtag</ulink>,
    289292      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub">libmspub</ulink>,
    290       <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
    291       <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
     293      <ulink url="https://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
     294      <ulink url="https://github.com/Numbertext/libnumbertext">libnumbertext</ulink>,
     295      <ulink url="https://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
    292296      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker">libpagemaker</ulink>,
    293       <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
     297      <ulink url="https://github.com/nayuki/QR-Code-generator">libqrcodegen</ulink>,
     298      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp">libqxp</ulink>,
     299      <ulink url="https://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
     300      <ulink url="https://github.com/fosnola/libstaroffice/wiki">libstaroffice</ulink>,
    294301      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
    295302      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
    296303      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
    297304      <ulink url="https://sourceforge.net/p/libwps/wiki/Home/">libwps</ulink>,
     305      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf">libzmf</ulink>,
    298306      <ulink url="http://lpsolve.sourceforge.net/">lp_solve</ulink>,
    299307      <ulink url="https://gitlab.com/mdds/mdds">mdds</ulink>,
    300       <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
     308      <ulink url="https://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
     309      <ulink url="https://odftoolkit.org/conformance/ODFValidator.html">odfvalidator</ulink>,
     310      <ulink url="https://code.google.com/archive/p/officeotron/">officeotron</ulink>,
    301311      <ulink url="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
    302312      <ulink url="https://gitlab.com/orcus/orcus">Orcus</ulink>,
    … …  
    331341
    332342<!-- keep a commented instruction if no patches are currently required -->
    333 <!--
    334     <para>
    335      Fix build failures introduced by GCC 10 and later:
    336     </para>
    337 
    338 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-format_overflow-1.patch</userinput></screen>
    339 -->
     343
     344    <para>
     345     Fix build failures introduced by the latest freetype version:
     346    </para>
     347
     348<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-freetype_fix-1.patch</userinput></screen>
     349
    340350    <para>
    341351      If you have downloaded the dictionaries, help and translations tarballs,
    … …  
    348358ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/ &amp;&amp;
    349359ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
     360
     361   <para>
     362      The instructions in the package unpack some tarballs into a location
     363      it cannot find later.  Create some symlinks to help out:
     364   </para>
     365
     366<screen><userinput>ln -sv src/libreoffice-help-&libreoffice-dlversion;/helpcontent2/ &amp;&amp;
     367ln -sv src/libreoffice-dictionaries-&libreoffice-dlversion;/dictionaries/ &amp;&amp;
     368ln -sv src/libreoffice-translations-&libreoffice-dlversion;/translations/</userinput></screen>
    350369
    351370    <note>
    … …  
    387406    </para>
    388407
    389 <!-- For the ICU seds, the spacing here is intentional. Sed will return syntax
    390      errors otherise -->
    391 
    392408<screen><userinput>sed -e "/gzip -f/d"   \
    393409    -e "s|.1.gz|.1|g" \
    … …  
    395411
    396412sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
    397 
    398 sed -i 29a\
    399 '\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' \
    400 external/libcdr/ExternalProject_libcdr.mk &amp;&amp;
    401 
    402 sed -i 30a\
    403 '\\t\t&amp;&amp;sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' \
    404 external/libebook/ExternalProject_libebook.mk &amp;&amp;
    405413
    406414./autogen.sh --prefix=$LO_PREFIX         \
    … …  
    509517    <para>
    510518      The suite and main modules can be started from the menu. From a terminal,
    511       the suite can be started with <command>libreoffice</command> command and
    512       the modules with <command>libreoffice
     519      the suite can be started with the <command>libreoffice</command> command
     520      and the modules with the <command>libreoffice
    513521      --<replaceable>&lt;module&gt;</replaceable></command> command,
    514522      respectively, where <replaceable>&lt;module&gt;</replaceable> is one of
    … …  
    527535    <para>
    528536      <command>sed -e ...</command>: The first sed prevents compression of the
    529       manual pages, the second one prevents the install from failing, and the
    530       third one allows the build to use poppler-0.86.1 and later.
     537      manual pages and the second one prevents the install from failing.
     538      <!--and the third one allows the build to use poppler-0.86.1 and later.-->
    531539      <!-- FIXME update hardcoded poppler version in text when necessary -->
    532     </para>
    533 
     540      <!-- FIXME as far as I can tell, that sed is no longer present, so I
     541           commented the description out here. -renodr -->
     542    </para>
     543
     544<!--
    534545    <para>
    535546      <command>sed -i "s/TRUE/true/" ...</command>: These three sed commands
    … …  
    539550      the external projects (the source tarballs are unpacked during the build).
    540551    </para>
    541 
     552-->
    542553    <para>
    543554      <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
    … …  
    650661-->
    651662    <para>
    652       <command>make distro-pack-install</command>: this does a normal
     663      <command>make distro-pack-install</command>: This does a normal
    653664      install, but if you add a DESTDIR environment variable it will also
    654665      install a lot of (text) gid_Module_* files in the DESTDIR, to help
    … …  
    732743      <application>base</application>.
    733744    </para>
    734     <!-- junit is not included anymore in ant, and neither hamcrest. Since
    735     the hsqldb backend is deprecated anyway, forget this:
    736     <para>
    737       <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option> and
    738       <option>- -with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>:
    739       Those options are needed if you want to run the tests.
    740     </para>
    741     -->
     745
    742746    <para>
    743747      <option>--without-fonts</option>: <application>LibreOffice</application>
    … …  
    815819          <para>
    816820            is the main libreofice suite (symlink to
    817             $LO_PREFIX/lib/libreoffice/program/soffice).
     821            $LO_PREFIX/lib/libreoffice/program/soffice)
    818822          </para>
    819823          <indexterm zone="libreoffice libreoffice-suite">
    … …  
    827831        <listitem>
    828832          <para>
    829             is the database manager module shell starting script.
     833            is the database manager module shell starting script
    830834          </para>
    831835          <indexterm zone="libreoffice lobase">
    … …  
    839843        <listitem>
    840844          <para>
    841             is the spreadsheet module shell starting script.
     845            is the spreadsheet module shell starting script
    842846          </para>
    843847          <indexterm zone="libreoffice localc">
    … …  
    852856          <para>
    853857            is the vector graphics editor and diagramming tool module shell
    854             starting script.
     858            starting script
    855859          </para>
    856860          <indexterm zone="libreoffice lodraw">
    … …  
    865869          <para>
    866870            is the (PowerPoint) presentations editor and displayer
    867             module shell starting script.
     871            module shell starting script
    868872          </para>
    869873          <indexterm zone="libreoffice loimpress">
    … …  
    877881        <listitem>
    878882          <para>
    879             is the mathematical formula editor module shell starting script.
     883            is the mathematical formula editor module shell starting script
    880884          </para>
    881885          <indexterm zone="libreoffice lomath">
    … …  
    889893        <listitem>
    890894          <para>
    891             is the HTML editor module shell starting script.
     895            is the HTML editor module shell starting script
    892896          </para>
    893897          <indexterm zone="libreoffice loweb">
    … …  
    901905        <listitem>
    902906          <para>
    903             is the word processor module shell starting script.
     907            is the word processor module shell starting script
    904908          </para>
    905909          <indexterm zone="libreoffice lowriter">
    … …  
    914918          <para>
    915919            is a tool to manage <application>LibreOffice</application>
    916             extensions from the command line.
     920            extensions from the command line
    917921          </para>
    918922          <indexterm zone="libreoffice unopkg">
Note: See TracChangeset for help on using the changeset viewer.