Changeset cc9c627 for xsoft


Ignore:
Timestamp:
11/11/2016 05:22:57 PM (7 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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, 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:
e66ebee
Parents:
324c76e
Message:

Update to libreoffice-5.2.3.3

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/libreoffice.xml

    r324c76e rcc9c627  
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "4a001b0b43e58a3e584cb703d72cf19d">
    11   <!ENTITY libreoffice-core-size          "174 MB">
     10  <!ENTITY libreoffice-core-md5sum        "6177d8be5ca358929277a19292cae36d">
     11  <!ENTITY libreoffice-core-size          "175 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "96e9ffae7c4c3163ebc0896652b4bd51">
    15   <!ENTITY libreoffice-dict-size          "39 MB">
     14  <!ENTITY libreoffice-dict-md5sum        "113eaf27048a8d2443852b917b03988c">
     15  <!ENTITY libreoffice-dict-size          "40 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "ea273836b1e1b670eee6f211bd5d9acf">
    19   <!ENTITY libreoffice-help-size          "1.9 MB">
     18  <!ENTITY libreoffice-help-md5sum        "d37cf576bf6df067474f96f3bf6369d6">
     19  <!ENTITY libreoffice-help-size          "1.8 MB">
    2020
    2121  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
    22   <!ENTITY libreoffice-translations-md5sum        "2b4d20576fbf5c26f57d268791bfa84c">
    23   <!ENTITY libreoffice-translations-size          "126 MB">
    24 
    25 
    26   <!ENTITY libreoffice-buildsize          "7.7 GB (594 MB installed)">
    27   <!ENTITY libreoffice-time               "41 SBU with parallelism = 4 + download time">
     22  <!ENTITY libreoffice-translations-md5sum        "2346cacee8b4e797ba23765b748cf3ae">
     23  <!ENTITY libreoffice-translations-size          "135 MB">
     24
     25
     26  <!ENTITY libreoffice-buildsize          "8.2 GB (610 MB installed)">
     27  <!ENTITY libreoffice-time               "32 SBU with parallelism = 8 + download time">
    2828
    2929]>
    … …  
    138138        </para>
    139139      </listitem>
    140 <!--
    141       <listitem>
    142         <para>
    143           Required patch to use <xref linkend="boost"/>:
    144           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_60_0-1.patch"/>
    145         </para>
    146       </listitem>-->
     140
     141      <listitem>
     142        <para>
     143          Required patch to fix building with system <xref linkend="icu"/>:
     144          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-icu_58-1.patch"/>
     145        </para>
     146      </listitem>
    147147    </itemizedlist>
    148148
    … …  
    170170    <para role="recommended">
    171171      <xref linkend="apr"/>,
    172       <xref linkend="boost"/> <!--(currently, broken with boost-1.60.0)-->,
     172      <xref linkend="boost"/>,
    173173      <xref linkend="clucene"/>,
    174174      <xref linkend="cups"/>,
    … …  
    191191      <xref linkend="neon"/>,
    192192      <xref linkend="nss"/>,
     193      <xref linkend="apache-ant"/>,
    193194      <xref linkend="openldap"/> (if connecting to an LDAP server),
    194195      <xref linkend="openssl"/> or
    … …  
    215216      <xref linkend="mitkrb"/>,
    216217      <xref linkend="nasm"/>,
    217       <xref linkend="openjdk"/>,
    218218      <xref linkend="sane"/>,
    219219      <xref linkend="valgrind"/>,
    … …  
    322322
    323323<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
    324 <!--
    325     <para>
    326      Fix build failures introduced by <application>boost-&boost-version;</application>:
    327     </para>
    328 
    329 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_60_0-1.patch</userinput></screen>-->
     324
     325    <para>
     326     Fix build failures introduced by <xref linkend="icu"/>:
     327    </para>
     328
     329<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-icu_58-1.patch</userinput></screen>
    330330
    331331    <para>
    … …  
    345345
    346346sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
    347 <!-- Seems to be fixed in 5.1.2.2
    348 sed -i "s#isnan#std::&amp;#g" xmloff/source/draw/ximp3dscene.cxx &amp;&amp; -->
    349 
    350 <!-- fixed in 5.2.0.4
    351 chmod -v +x bin/unpack-sources &amp;&amp; -->
    352347
    353348./autogen.sh --prefix=$LO_PREFIX         \
    … …  
    358353             --with-myspell-dicts        \
    359354             --with-alloc=system         \
    360              --without-java              \
     355             --without-junit             \
    361356             --without-system-dicts      \
    362357             --disable-dconf             \
    … …  
    366361             --enable-python=system      \
    367362             --with-system-apr           \
    368              --with-system-boost=yes     \
     363             --with-system-boost         \
    369364             --with-system-cairo         \
    370365             --with-system-clucene       \
    … …  
    410405
    411406<screen role="root"><userinput>make distro-pack-install</userinput></screen>
    412 <!-- $LO_PREFIX/share/appdata/*.xml gets installed by distro-pack-install
    413 in 5.2.0.4 -->
    414407
    415408    <para>
    … …  
    512505
    513506    <para>
    514       <parameter>--with-system-boost=<replaceable>&lt;yes/no&gt;</replaceable></parameter>:
    515       This switch enables/disables use of system boost, so bundled one may be or
    516       not used, because currently, depending on the user decision, or if the
    517       build is broken with latest <application>Boost</application> in BLFS,
    518       which frequently occurs and there is a delay until either a fix is found
    519       or it is fixed upstream.
     507      <parameter>--with-system-boost</parameter>: This switch enables using
     508      system boost. From time to time, recent versions of boost break
     509      the build of libreoffice. In this case, it is possible to use the
     510      bundled copy of boost, by removing this flag.
    520511    </para>
    521512
    … …  
    527518
    528519    <para>
     520      <parameter>--without-junit</parameter>: This switch disables the HSQLDB
     521      tests (the HSQLDB driver is written in Java). If you want to run the
     522      tests, be sure to install <filename>junit.jar</filename> and <filename>
     523      hamcrest.jar</filename> in <filename class="directory">/usr/share/java
     524      </filename>.
     525    </para>
     526
     527    <para>
    529528      <parameter>--without-system-dicts</parameter>: This switch disables use
    530529      of  dictionaries from system paths, so the ones installed by this package
    531530      are used.
    532     </para>
    533 
    534     <para>
    535       <parameter>--without-java</parameter>: This switch disables
    536       <application>Java</application> support in
    537       <application>LibreOffice</application>. Remove this option if
    538       <application>Java</application> is installed and needed.  Most users will
    539       not need <application>Java</application> in this application.
    540531    </para>
    541532
    … …  
    575566
    576567    <para>
    577       <parameter>--with-parallelism=&lt;count&gt;</parameter>: This switch
     568      <option>--with-parallelism=&lt;count&gt;</option>: This switch
    578569      tells <application>LibreOffice</application> to use &lt;count&gt; CPU
    579570      cores to compile in parallel.  (Do not include literal angle brackets.)
    580       The default is $(getconf _NPROCESSORS_ONLN) which uses all availalble
    581       cores on the system.
     571      The default is to use all available cores on the system.
    582572    </para>
    583573
    … …  
    629619      installed some or all of the same fonts, you may prefer to use the system
    630620      versions.
     621    </para>
     622
     623    <para>
     624      <option>--without-java</option>: This switch disables
     625      <application>Java</application> support in
     626      <application>LibreOffice</application>. Java is needed for the HSQLDB
     627      driver, which allows reading databases created by other programs into
     628      libreoffice <application>base</application>.
    631629    </para>
    632630
Note: See TracChangeset for help on using the changeset viewer.