Ignore:
Timestamp:
09/02/2023 08:28:02 PM (13 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
lazarus
Children:
3e86dee
Parents:
03ecbc8a (diff), 642d7af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into lazarus

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/libreoffice.xml

    r03ecbc8a rf7a5feb9  
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "6dc4563fe629cd944b3122475dc80461">
    11   <!ENTITY libreoffice-core-size          "258 MB">
     10  <!ENTITY libreoffice-core-md5sum        "b6994286fa3c274d1beac33aca80c442">
     11  <!ENTITY libreoffice-core-size          "267 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "bdf9b66f43a02c56565d9c97d0e42895">
    15   <!ENTITY libreoffice-dict-size          "50 MB">
     14  <!ENTITY libreoffice-dict-md5sum        "1bada07c06d85ac82587b231a0644676">
     15  <!ENTITY libreoffice-dict-size          "51 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "33e8603050f3b30e67620135ef675238">
    19   <!ENTITY libreoffice-help-size          "159 MB">
     18  <!ENTITY libreoffice-help-md5sum        "726d9aa6dc1e6041c9b4a936fc62b2bd">
     19  <!ENTITY libreoffice-help-size          "160 MB">
    2020
    2121  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
    22   <!ENTITY libreoffice-translations-md5sum        "4c5159ac5da079a69f2ae3dc47dfd584">
    23   <!ENTITY libreoffice-translations-size          "196 MB">
     22  <!ENTITY libreoffice-translations-md5sum        "107f419fe95a42d4698f444397c5e569">
     23  <!ENTITY libreoffice-translations-size          "207 MB">
    2424
    2525  <!-- full size remeasured for 7.0.0.3 -->
    2626
    27   <!ENTITY libreoffice-buildsize  "6.9 GB including the additional files if downloaded during the build (686 MB installed). Installing the whole set of languages requires more than 25 GB (around 3 GB installed)">
     27  <!ENTITY libreoffice-buildsize  "10 GB including the additional files if downloaded during the build (727 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
    … …  
    5858       For 7.5.4.2, I increased the parallelism to 8.  -bdubbs
    5959  -->
    60   <!ENTITY libreoffice-time "23 SBU with parallelism=8 (will vary due to download time)">
     60  <!ENTITY libreoffice-time "40 SBU with parallelism=8 (will vary due to download time)">
    6161
    6262]>
    … …  
    8181    </para>
    8282
    83     &lfs113_checked;
     83    &lfs120_checked;
    8484
    8585    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    118118        Around 80 smallish tarballs and zip files will be downloaded during the
    119119        build. The download time will vary with the local internet speed and
    120         server load.  The download time is about 3 mn on a fiber connection,
    121         probably not much more than 10 mn on an ADSL connection.
    122         If you have not downloaded one or more of the following, they too
     120        server load.  The download time is about 3 minutes on a fiber connection
     121        and probably not much more than 10 minutes on an ADSL connection.
     122        If you have not downloaded one or more of the following, they
    123123        will also be downloaded during the build.
    124124      </para>
    … …  
    179179        </para>
    180180      </listitem>
    181 <!--
    182       <listitem>
    183         <para>
    184           Required patch to fix building with fixed version of <xref
    185           linkend="boost"/>:
    186           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost1810-1.patch"/>
    187         </para>
    188       </listitem>
    189 -->
     181
    190182<!-- keep one commented patch, it's sure to again need one or more in a few months:-->
    191183
    … …  
    272264      <xref linkend="mitkrb"/>,
    273265      <xref linkend="nasm"/>,
     266      &qt5-deps;,
    274267      <xref linkend="sane"/>,
    275268      <xref linkend="telepathy-glib"/>,
    … …  
    359352<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_22_09_fixes-1.patch</userinput></screen>
    360353-->
    361 <!--
    362     <para>
    363      First, fix a build failure introduced by the latest boost version:
    364     </para>
    365 
    366 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost1810-1.patch</userinput></screen>
    367 -->
     354
    368355    <para>
    369356      If you have downloaded the dictionaries, help and translations tarballs,
    … …  
    420407
    421408    <para>
    422       If building on a 32 bit machine, <envar>CFLAGS</envar> is set to
     409      If you are building on a 32 bit machine, <envar>CFLAGS</envar> is set to
    423410      <command>-Os</command>, which breaks the build. Prevent this
    424411      by issuing:
    … …  
    428415   i?86) sed /-Os/d -i solenv/gbuild/platform/LINUX_INTEL_GCC.mk ;;
    429416esac</userinput></screen>
    430 <!-- Not needed anymore with last version (1.10.13) of apache-ant
    431     <para>
    432       <xref linkend="openjdk"/> breaks the build if the following variable is
    433       not set:
    434     </para>
    435 
    436 <screen><userinput>export ANT_OPTS="-Djava.security.manager=allow"</userinput></screen>
    437 -->
    438 
    439 <!-- I didn't need this with gpgme-1.20.0, but not tested with gpgme-1.21.0 - bdubbs
    440 
    441     <para>
    442       The latest version of GPGME breaks configure due to a library change.
    443       Fix it by setting the following variable:
    444     </para>
    445 
    446 <screen><userinput remap="pre">export ac_cv_lib_gpgmepp_progress_callback=yes</userinput></screen>
    447 -->
     417
     418    <!-- see the attachment in Ticket #18435 -->
     419    <para>
     420      If you decide to pass the <option>--disable-java</option> to configure,
     421      fix an issue that causes the build to fail:
     422    </para>
     423
     424<screen><userinput>sed -i '940i #if HAVE_FEATURE_JAVA' cui/source/options/optjava.cxx &amp;&amp;
     425sed -i '966i #endif'                cui/source/options/optjava.cxx</userinput></screen>
     426
    448427    <para>
    449428      Prepare <application>LibreOffice</application> for compilation by running
    … …  
    470449             --enable-python=system      \
    471450             --with-jdk-home=/opt/jdk    \
    472              --with-system-boost         \
    473451             --with-system-clucene       \
    474452             --with-system-curl          \
    … …  
    586564    </para>
    587565
    588 <!--
    589     <para>
    590       <command>sed -i "s/TRUE/true/" ...</command>: These three sed commands
    591       fix breakage caused by <application>ICU-68.1</application> removing a
    592       macro. The third sed is for a file within libreoffice, the first two
    593       are for packages downloaded during the build and amend '.mk' files for
    594       the external projects (the source tarballs are unpacked during the build).
    595     </para>
    596 -->
    597566    <para>
    598567      <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
    … …  
    633602      set.
    634603    </para>
    635     <!-- Unrecognized as of 6.2.0.3
    636     <para>
    637       <parameter>- -with-alloc=system</parameter>: This switch tells
    638       <application>LibreOffice</application> to use the system allocator
    639       instead of its internal one.
    640     </para>
    641    -->
    642     <para>
    643       <parameter>--with-system-boost</parameter>: This switch enables using
     604
     605    <!-- The boost issues have resurfaced with boost-1.83.0... this time it's
     606         with the locale library.
     607    <para>
     608      <parameter>- -with-system-boost</parameter>: This switch enables using
    644609      system boost. From time to time, recent versions of boost break
    645610      the build of libreoffice. In this case, it is possible to use the
    646611      bundled copy of boost by removing this flag.
    647612    </para>
     613    -->
    648614
    649615    <para>
    … …  
    739705      installed <xref linkend="gst10-plugins-base"/>.
    740706    </para>
    741 
    742 <!-- only gtk3 is referenced in the configure script for 6.4.0.3
    743     <para>
    744       <option>\-\-disable-gtk3</option>: Use this switch if you have not installed
    745       <application>GTK+-3</application>, or if you have installed it but wish
    746       to use <application>GTK+-2</application> (the menu icons differ).
    747  <!\-\- Note that a <application>GTK+-3</application> build still
    748       requires <application>GTK+-2</application> to build the gtk-plugin.\-\->
    749     </para>-->
    750707
    751708    <para>
    … …  
    785742      deprecated HSQLDB driver, which allows reading databases created by
    786743      other programs or in earlier versions of libreoffice
    787       <application>base</application>.
     744      <application>base</application>. It is also needed for some optional
     745      user interface components.
    788746    </para>
    789747
    … …  
    809767      address books through Evolution Data Server. Note that Evolution Data
    810768      Server must be installed for this feature to function.
     769    </para>
     770
     771    <para>
     772      <option>--enable-qt5</option>: This switch enables support for integration
     773      with Qt5 and the Qt5 theming engine. If &qt5-deps; is not installed in
     774      <filename class="directory">/usr</filename>, the include and library
     775      directories must be specified in the <envar>QT5INC</envar> and
     776      <envar>QT5LIB</envar> environment variables.
    811777    </para>
    812778
Note: See TracChangeset for help on using the changeset viewer.