Author: cjg
Date: Tue Sep 2 10:16:08 2014
New Revision: 14173
Log:
Merged libreoffice change from trunk.
Modified:
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/packages.ent
branches/systemd/xsoft/office/libreoffice.xml
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Tue Sep 2 09:51:26
2014 (r14172)
+++ branches/systemd/introduction/welcome/changelog.xml Tue Sep 2 10:16:08
2014 (r14173)
@@ -52,6 +52,10 @@
<listitem>
<para>[cjg] - Updated appdata-tools to new version.</para>
</listitem>
+ <listitem>
+ <para>[fernando] - Update to libreoffice-4.3.1.2. Fixes
+ <ulink url="&blfs-ticket-root;5445">#5445</ulink>.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Tue Sep 2 09:51:26 2014 (r14172)
+++ branches/systemd/packages.ent Tue Sep 2 10:16:08 2014 (r14173)
@@ -550,8 +550,8 @@
<!ENTITY gnumeric-version "1.12.17">
<!ENTITY gnucash-version "2.4.11">
-<!ENTITY libreoffice-version "4.3.0">
-<!ENTITY libreoffice-patch ".4">
+<!ENTITY libreoffice-version "4.3.1">
+<!ENTITY libreoffice-patch ".2">
<!ENTITY libreoffice-dlversion
"&libreoffice-version;&libreoffice-patch;">
<!-- Chapter 35 -->
Modified: branches/systemd/xsoft/office/libreoffice.xml
==============================================================================
--- branches/systemd/xsoft/office/libreoffice.xml Tue Sep 2 09:51:26
2014 (r14172)
+++ branches/systemd/xsoft/office/libreoffice.xml Tue Sep 2 10:16:08
2014 (r14173)
@@ -7,23 +7,36 @@
<!ENTITY libreoffice-dl
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;";>
<!ENTITY libreoffice-core-download-http
"&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
- <!ENTITY libreoffice-core-md5sum "de0d9322f3aaeb20abd5e06c5c0972bb">
- <!ENTITY libreoffice-core-size "145 MB">
+ <!ENTITY libreoffice-core-md5sum "cf750c01b6cd0b5c6fdd1760672e67d4">
+ <!ENTITY libreoffice-core-size "146 MB">
<!ENTITY libreoffice-dict-download-http
"&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
- <!ENTITY libreoffice-dict-md5sum "cd27ec060c68079a13abf0984dbbf5fa">
+ <!ENTITY libreoffice-dict-md5sum "aae27f6c9db741c42acae48a1dfb0f5e">
<!ENTITY libreoffice-dict-size "36 MB">
<!ENTITY libreoffice-help-download-http
"&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
- <!ENTITY libreoffice-help-md5sum "89d9da0ff2d5ea07f8c30c680fee2b0a">
+ <!ENTITY libreoffice-help-md5sum "24692bf69bbe877ad2524653c991705a">
<!ENTITY libreoffice-help-size "1.8 MB">
<!ENTITY libreoffice-translations-download-http
"&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
- <!ENTITY libreoffice-translations-md5sum
"8e2f7905a0f827f655a1e21d93c6ddf7">
+ <!ENTITY libreoffice-translations-md5sum
"b8d3445100c10bb4f21f6c8f25c5c600">
<!ENTITY libreoffice-translations-size "121 MB">
- <!ENTITY libreoffice-buildsize "8.23 GB (497 MB installed), 9.6 GB
(528 MB installed) with translations">
- <!ENTITY libreoffice-time "144.3 SBU, with translations">
+ <!-- This package has some peculiarities, some discussed in the text.
+ Two values for SBU and buildsize are given due to the large difference
+ measured by editors, depending on architecture and sometimes installed
+ dependencies (with-system... -->
+
+ <!ENTITY libreoffice-buildsize "8.1 GB (535 MB installed), with
translations">
+ <!ENTITY libreoffice-time "200 SBU, with translations">
+ <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
+ boundaries for x86_64 of previous versions, thus, temporarily, decided to use
+ single statistcs, instead of a range.
+ -->
+ <!-- This package has some peculiarities, some discussed in the text.
+ Two values for SBU and buildsize are given due to the large difference
+ measured by editors, depending on architecture and sometimes installed
+ dependencies (with-system... -->
]>
<sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;">
@@ -129,7 +142,13 @@
</listitem>
<listitem>
<para>
- Required patch for i686 systems, in order to fix a problem introduced
+ Required patch to fix building with system Boost:
+ <ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Required patch for i686 systems, in order to fix a problem inroduced
by <application>&gcc-490;</application>:
<ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
</para>
@@ -160,7 +179,7 @@
</note>
<para role="recommended">
- <!--<xref linkend="boost"/>,-->
+ <xref linkend="boost"/>,
<xref linkend="clucene"/>,
<xref linkend="cups"/>,
<xref linkend="curl"/>,
@@ -241,7 +260,7 @@
<sect2 role="installation">
<title>Installation of LibreOffice</title>
-
+<!--
<warning>
<para>
Untaring the libreoffice-&libreoffice-dlversion; tarball as
@@ -259,12 +278,21 @@
<para>
You can avoid this unpleasantness by
<emphasis>not</emphasis> untaring it as
- <systemitem class="username">root</systemitem>. If you must untar
- it as <systemitem class="username">root</systemitem> pass the
- option <option>--no-overwrite-dir</option> to tar when untaring
- as <systemitem class="username">root</systemitem>:
+ <systemitem class="username">root</systemitem>. If you must untar it as
+ <systemitem class="username">root</systemitem> pass the option
+ <option>-\-no-overwrite-dir</option> to tar. This is the default when
you
+ untar as a user but has to be passed as an option when untaring as
+ <systemitem class="username">root</systemitem>:
+ </para>
+ </warning>-->
+
+ <note>
+ <para>
+ It is recommended to build this package in a graphical environment,
+ because there have been reports of build failures, when using
+ <command>chroot</command> or <command>ssh</command>.
</para>
- </warning>
+ </note>
<screen role="root"><userinput>tar -xf
libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &&
cd libreoffice-&libreoffice-dlversion;</userinput></screen>
@@ -276,15 +304,18 @@
<screen><userinput>install -dm755 external/tarballs &&
-tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz
--no-overwrite-dir --strip-components=1 &&
-ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz
external/tarballs/ &&
-ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz
external/tarballs/</userinput></screen>
+tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
+ --no-overwrite-dir --strip-components=1 &&
+<!-- Not necessary for this version
+tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir
-\-strip-components=1 &&
+-->
<para>
If you have downloaded the translations tarball, create a symlink:
</para>
-<screen><userinput>ln -sfv
../../libreoffice-translations-&libreoffice-dlversion;.tar.xz
external/tarballs/</userinput></screen>
+<screen><userinput>ln -sv
../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz \
+ external/tarballs/</userinput></screen>
<note>
<para>
@@ -313,17 +344,16 @@
the following commands:
</para>
-<screen><userinput>sed -e "/gzip -f/d" \
+<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &&
+
+sed -e "/gzip -f/d" \
-e "s|.1.gz|.1|g" \
-i bin/distro-install-desktop-integration &&
-sed -e "/distro-install-file-lists/d" -i Makefile.in &&
-sed -e "/distro-install-file-lists/d" \
- -e "s:fetch_Download_item:&_unchecked:" \
- -e "/fetch_Download_item/s:,no-check::" \
- -i Makefile.in &&
+sed -e "/distro-install-file-lists/d" -i Makefile.in &&
chmod -v +x bin/unpack-sources &&
+chmod -v +x bin/unpack-sources &&
sed -e "s/target\.mk/langlist\.mk/" \
-e "s/tar -xf/tar -x --strip-components=1 -f/" \
-e "/tar -x/s/lo_src_dir/start_dir/" \
@@ -339,9 +369,9 @@
--disable-gconf \
--disable-odk \
--disable-postgresql-sdbc \
- --enable-release-build \
- --enable-python=system \<!--
- - -with-system-boost \ -->
+ --enable-release-build=yes \
+ --enable-python=system \
+ --with-system-boost \
--with-system-clucene \
--with-system-cairo \
--with-system-curl \
@@ -412,8 +442,7 @@
<para>
<command>sed -e ...</command>: First sed prevents compression of the
manual pages, the second one prevents a script that causes install to
- fail from running, the third one fixes the download location
- and the fourth one fixes the unpack script.
+ fail from running, the third one fixes the unpack script.
</para>
<para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
