Changeset 8e2c769


Ignore:
Timestamp:
05/05/2012 02:42:10 PM (12 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal
Children:
e447aff
Parents:
5b9edb4
Message:

Libreoffice tweaks
The download script now downloads the dictionaries, help files and
translations so we don't need to do that by hand.
I think the SBU is an underestimate but I don't have time to run a single
threaded build just now. I'll leave it running tonight and update it with a
more accurate figure tomorrow.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    r5b9edb4 r8e2c769  
    4343-->
    4444    <listitem>
     45      <para>May 5th, 2012</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[abenton] - Updated Libreoffice to 3.5.3.2.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
    4554      <para>May 4th, 2012</para>
    4655      <itemizedlist>

  • xsoft/office/libreoffice.xml

    r5b9edb4 r8e2c769  
    1010  <!ENTITY libreoffice-core-md5sum        "d22cd79e7463ac4caf0a4b47d78a82ac">
    1111  <!ENTITY libreoffice-core-size          "99 MB">
    12 
    13   <!ENTITY libreoffice-dictionaries-download-http
    14   "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-dictionaries-&libreoffice-version;.2.tar.xz">
    15   <!ENTITY libreoffice-dictionaries-download-ftp  " ">
    16   <!ENTITY libreoffice-dictionaries-md5sum        "f4ebfe04dc035dd075709a3f6cb76284">
    17   <!ENTITY libreoffice-dictionaries-size          "32 MB">
    18   <!ENTITY libreoffice-help-download-http
    19   "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-help-&libreoffice-version;.2.tar.xz">
    20   <!ENTITY libreoffice-help-download-ftp  " ">
    21   <!ENTITY libreoffice-help-md5sum        "3455f3f523d739aa391b5a5bf04ff958">
    22   <!ENTITY libreoffice-help-size          "1.8 MB">
    23 
    24   <!ENTITY libreoffice-translations-download-http
    25   "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-translations-&libreoffice-version;.2.tar.xz">
    26   <!ENTITY libreoffice-translations-download-ftp  " ">
    27   <!ENTITY libreoffice-translations-md5sum        "945fbf7888c464f4e1cf7282d370b257">
    28   <!ENTITY libreoffice-translations-size          "117 MB">
    29 
    3012  <!ENTITY libreoffice-buildsize     "6 GB (379 MB installed)">
    3113  <!ENTITY libreoffice-time          "61 SBU">
    … …  
    7860        <para>
    7961          Core Download size: &libreoffice-core-size;
    80         </para>
    81       </listitem>
    82       <listitem>
    83         <para>
    84           Dictionaries Download (HTTP):
    85           <ulink url="&libreoffice-dictionaries-download-http;"/>
    86         </para>
    87       </listitem>
    88       <listitem>
    89         <para>
    90           Dictionaries Download (FTP):
    91           <ulink url="&libreoffice-dictionaries-download-ftp;"/>
    92         </para>
    93       </listitem>
    94       <listitem>
    95         <para>
    96           Dictionaries Download MD5 sum: &libreoffice-dictionaries-md5sum;
    97         </para>
    98       </listitem>
    99       <listitem>
    100         <para>
    101           Dictionaries Download size: &libreoffice-dictionaries-size;
    102         </para>
    103       </listitem>
    104       <listitem>
    105         <para>
    106           Help Download (HTTP): <ulink url="&libreoffice-help-download-http;"/>
    107         </para>
    108       </listitem>
    109       <listitem>
    110         <para>
    111           Help Download (FTP): <ulink url="&libreoffice-help-download-ftp;"/>
    112         </para>
    113       </listitem>
    114       <listitem>
    115         <para>
    116           Help Download MD5 sum: &libreoffice-help-md5sum;
    117         </para>
    118       </listitem>
    119       <listitem>
    120         <para>
    121           Help Download size: &libreoffice-help-size;
    122         </para>
    123       </listitem>
    124       <listitem>
    125         <para>
    126           Translations Download (HTTP):
    127           <ulink url="&libreoffice-translations-download-http;"/>
    128         </para>
    129       </listitem>
    130       <listitem>
    131         <para>
    132           Translations Download (FTP):
    133           <ulink url="&libreoffice-translations-download-ftp;"/>
    134         </para>
    135       </listitem>
    136       <listitem>
    137         <para>
    138           Translations Download MD5 sum: &libreoffice-translations-md5sum;
    139         </para>
    140       </listitem>
    141       <listitem>
    142         <para>
    143           Translations Download size: &libreoffice-translations-size;
    14462        </para>
    14563      </listitem>
    … …  
    242160    </warning>
    243161
    244 <screen role="root"><userinput>tar xf --no-overwrite-dir libreoffice-core-&libreoffice-version;.2.tar.xz &amp;&amp;
     162<screen role="root"><userinput>tar -xf libreoffice-core-&libreoffice-version;.2.tar.xz --no-overwrite-dir &amp;&amp;
    245163cd libreoffice-core-&libreoffice-version;.2</userinput></screen>
    246164
    … …  
    250168    </para>
    251169
    252 <screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-version;.2.tar.xz --strip-components=1 &amp;&amp;
    253 tar -xf ../libreoffice-help-&libreoffice-version;.2.tar.xz         --strip-components=1 &amp;&amp;
    254 tar -xf ../libreoffice-dictionaries-&libreoffice-version;.2.tar.xz --strip-components=1 &amp;&amp;
    255 ./autogen.sh --prefix=/usr \
     170<screen><userinput>./autogen.sh --prefix=/usr \
    256171  --disable-binfilter      \
    257172  --disable-gconf          \
    … …  
    275190  --with-system-redland    \
    276191  --with-system-zlib       \
    277   --with-num-cpus=$(getconf _NPROCESSORS_ONLN) \
    278192  --with-lang="pt-BR"      \
    279   --without-java           &amp;&amp;
    280 ./download                 &amp;&amp;
    281 mkdir -p ../libreoffice-downloads &amp;&amp;
    282 cp -rf src/* ../libreoffice-downloads &amp;&amp;
     193  --without-java           \
     194  --with-num-cpus=$(getconf _NPROCESSORS_ONLN) &amp;&amp;
     195./download                                     &amp;&amp;
     196mkdir -p ../libreoffice-downloads              &amp;&amp;
     197cp src/*.{xz,gz,txt,zip,bz2,tgz,jar,dll,oxt}   \
     198      src/*LICENSE* ../libreoffice-downloads   &amp;&amp;
    283199make</userinput></screen>
    284200
    285     <para>
    286       This package does not come with a test suite.
    287     </para>
     201    <para>This package does not come with a test suite.</para>
    288202
    289203    <para>
    … …  
    317231
    318232    <para>
    319       <command>tar -xf ../libreoffice-translations-&libreoffice-version;.2.tar.xz
    320       --strip-components=1</command>: This command untars the translations
    321       inside the source. The <option>--strip-components=1</option> option
    322       removes the leading directory from the path of the untared files. Without
    323       this option we would need to move or symlink the
    324       <filename class="directory">translations</filename> folder into the
    325       correct position.
    326     </para>
    327 
    328     <para>
    329       <command>tar -xf ../libreoffice-help-&libreoffice-version;.2.tar.xz
    330       --strip-components=1</command>: This command untars the help files inside
    331       the source. The <option>--strip-components=1</option> option removes the
    332       leading directory from the path of the untared files. Without this option
    333       we would need to move or symlink the
    334       <filename class="directory">helpcontent2</filename> folder into the
    335       correct position.
    336     </para>
    337 
    338     <para>
    339       <command>tar -xf ../libreoffice-dictionaries-&libreoffice-version;.2.tar.xz
    340       --strip-components=1</command>: This command untars the dictionaries inside
    341       the source. The <option>--strip-components=1</option> option removes the
    342       leading directory from the path of the untared files. Without this option
    343       we would need to move or symlink the
    344       <filename class="directory">dictionaries</filename> folder into the
    345       correct position.
    346     </para>
    347 
    348     <para>
    349233      <option>--enable-gtk3</option>: Add this option if you've installed and
    350234      want to use <application>Gtk+-3</application>.
    … …  
    414298    <para>
    415299      <command>./download</command>: The build process runs the
    416       <command>download</command> script which downloads some 320MB of
    417       source tarballs and another copy of the dictionaries, help files and
    418       translations. We run the download script to get it out of the way at the
     300      <command>download</command> script which downloads some 470 MB of
     301      tarballs. We run the download script to get it out of the way at the
    419302      start so we can make a backup copy of the downloaded files.
    420303    </para>
    … …  
    422305    <para>
    423306      <command>mkdir -p ../libreoffice-downloads;
    424       cp -rf src/* ../libreoffice-downloads</command>: this makes a backup copy
     307      cp src/*.{xz,gz,txt,zip,bz2,tgz,jar,dll,oxt} src/*LICENSE*
     308      ../libreoffice-downloads</command>: this makes a backup copy
    425309      of the downloaded files so you don't have to download them again if you
    426310      decide to recompile <application>Libre Office</application>. In that case,
Note: See TracChangeset for help on using the changeset viewer.