Changeset bb040d25


Ignore:
Timestamp:
09/02/2014 05:16:08 PM (10 years ago)
Author:
Christopher Gregory <cjg@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14686, systemd-13485
Children:
1831bfec
Parents:
bf0c8b8
Message:

Merged libreoffice change from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14173 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    rbf0c8b8 rbb040d25  
    5252        <listitem>
    5353          <para>[cjg] - Updated appdata-tools to new version.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[fernando] - Update to libreoffice-4.3.1.2. Fixes
     57          <ulink url="&blfs-ticket-root;5445">#5445</ulink>.</para>
    5458        </listitem>
    5559      </itemizedlist>

  • packages.ent

    rbf0c8b8 rbb040d25  
    551551<!ENTITY gnucash-version              "2.4.11">
    552552
    553 <!ENTITY libreoffice-version          "4.3.0">
    554 <!ENTITY libreoffice-patch            ".4">
     553<!ENTITY libreoffice-version          "4.3.1">
     554<!ENTITY libreoffice-patch            ".2">
    555555<!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">
    556556

  • xsoft/office/libreoffice.xml

    rbf0c8b8 rbb040d25  
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "de0d9322f3aaeb20abd5e06c5c0972bb">
    11   <!ENTITY libreoffice-core-size          "145 MB">
     10  <!ENTITY libreoffice-core-md5sum        "cf750c01b6cd0b5c6fdd1760672e67d4">
     11  <!ENTITY libreoffice-core-size          "146 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "cd27ec060c68079a13abf0984dbbf5fa">
     14  <!ENTITY libreoffice-dict-md5sum        "aae27f6c9db741c42acae48a1dfb0f5e">
    1515  <!ENTITY libreoffice-dict-size          "36 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "89d9da0ff2d5ea07f8c30c680fee2b0a">
     18  <!ENTITY libreoffice-help-md5sum        "24692bf69bbe877ad2524653c991705a">
    1919  <!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        "8e2f7905a0f827f655a1e21d93c6ddf7">
     22  <!ENTITY libreoffice-translations-md5sum        "b8d3445100c10bb4f21f6c8f25c5c600">
    2323  <!ENTITY libreoffice-translations-size          "121 MB">
    2424
    25   <!ENTITY libreoffice-buildsize          "8.23 GB (497 MB installed), 9.6 GB (528 MB installed) with translations">
    26   <!ENTITY libreoffice-time               "144.3 SBU, with translations">
     25  <!-- This package has some peculiarities, some discussed in the text.
     26  Two values for SBU and buildsize are given due to the large difference
     27  measured by editors, depending on architecture and sometimes installed
     28  dependencies (with-system... -->
     29
     30  <!ENTITY libreoffice-buildsize          "8.1 GB (535 MB installed), with translations">
     31  <!ENTITY libreoffice-time               "200 SBU, with translations">
     32  <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
     33  boundaries for x86_64 of previous versions, thus, temporarily, decided to use
     34  single statistcs, instead of a range.
     35  -->
     36  <!-- This package has some peculiarities, some discussed in the text.
     37  Two values for SBU and buildsize are given due to the large difference
     38  measured by editors, depending on architecture and sometimes installed
     39  dependencies (with-system... -->
    2740]>
    2841
    … …  
    130143      <listitem>
    131144        <para>
    132           Required patch for i686 systems, in order to fix a problem introduced
     145          Required patch to fix building with system Boost:
     146          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
     147        </para>
     148      </listitem>
     149      <listitem>
     150        <para>
     151          Required patch for i686 systems, in order to fix a problem inroduced
    133152          by <application>&gcc-490;</application>:
    134153          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
    … …  
    161180
    162181    <para role="recommended">
    163       <!--<xref linkend="boost"/>,-->
     182      <xref linkend="boost"/>,
    164183      <xref linkend="clucene"/>,
    165184      <xref linkend="cups"/>,
    … …  
    242261  <sect2 role="installation">
    243262    <title>Installation of LibreOffice</title>
    244 
     263<!--
    245264    <warning>
    246265      <para>
    … …  
    260279        You can avoid this unpleasantness by
    261280        <emphasis>not</emphasis> untaring it as
    262         <systemitem class="username">root</systemitem>. If you must untar
    263         it as <systemitem class="username">root</systemitem> pass the
    264         option <option>--no-overwrite-dir</option> to tar when untaring
    265         as <systemitem class="username">root</systemitem>:
     281        <systemitem class="username">root</systemitem>. If you must untar it as
     282        <systemitem class="username">root</systemitem> pass the option
     283        <option>-\-no-overwrite-dir</option> to tar. This is the default when you
     284        untar as a user but has to be passed as an option when untaring as
     285        <systemitem class="username">root</systemitem>:
    266286      </para>
    267     </warning>
     287    </warning>-->
     288
     289    <note>
     290      <para>
     291       It is recommended to build this package in a graphical environment,
     292       because there have been reports of build failures, when using
     293       <command>chroot</command> or <command>ssh</command>.
     294      </para>
     295    </note>
    268296
    269297<screen role="root"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
    … …  
    277305<screen><userinput>install -dm755 external/tarballs &amp;&amp;
    278306
    279 tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
    280 ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
    281 ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
     307tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
     308        --no-overwrite-dir --strip-components=1    &amp;&amp;
     309<!-- Not necessary for this version
     310tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
     311-->
    282312
    283313    <para>
    … …  
    285315    </para>
    286316
    287 <screen><userinput>ln -sfv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
     317<screen><userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz \
     318       external/tarballs/</userinput></screen>
    288319
    289320    <note>
    … …  
    314345    </para>
    315346
    316 <screen><userinput>sed -e "/gzip -f/d"   \
     347<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &amp;&amp;
     348
     349sed -e "/gzip -f/d"   \
    317350    -e "s|.1.gz|.1|g" \
    318351    -i bin/distro-install-desktop-integration        &amp;&amp;
     352
    319353sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
    320354
    321 sed -e "/distro-install-file-lists/d"           \
    322     -e "s:fetch_Download_item:&amp;_unchecked:"     \
    323     -e "/fetch_Download_item/s:,no-check::"     \
    324    -i Makefile.in                                  &amp;&amp;
    325 
     355chmod -v +x bin/unpack-sources                     &amp;&amp;
    326356chmod -v +x bin/unpack-sources                     &amp;&amp;
    327357sed -e "s/target\.mk/langlist\.mk/"                \
    … …  
    340370             --disable-odk               \
    341371             --disable-postgresql-sdbc   \
    342              --enable-release-build      \
    343              --enable-python=system      \<!--
    344              - -with-system-boost    \ -->
     372             --enable-release-build=yes  \
     373             --enable-python=system      \
     374             --with-system-boost         \
    345375             --with-system-clucene       \
    346376             --with-system-cairo         \
    … …  
    413443      <command>sed -e ...</command>: First sed prevents compression of the
    414444      manual pages, the second one prevents a script that causes install to
    415       fail from running, the third one fixes the download location
    416       and the fourth one fixes the unpack script.
     445      fail from running, the third one fixes the unpack script.
    417446    </para>
    418447
Note: See TracChangeset for help on using the changeset viewer.