Author: rthomsen
Date: 2012-08-13 10:01:55 -0600 (Mon, 13 Aug 2012)
New Revision: 10507
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/boost.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/add/kdeadmin.xml
trunk/BOOK/xsoft/office/libreoffice.xml
Log:
LibreOffice 3.6.0 and improved Boost introduction.
Modified: trunk/BOOK/general/genlib/boost.xml
===================================================================
--- trunk/BOOK/general/genlib/boost.xml 2012-08-13 15:17:23 UTC (rev 10506)
+++ trunk/BOOK/general/genlib/boost.xml 2012-08-13 16:01:55 UTC (rev 10507)
@@ -30,8 +30,10 @@
<title>Introduction to Boost</title>
<para>
- <application>Boost</application> provides free peer-reviewed
- portable C++ source libraries.
+ <application>Boost</application> provides a set of free peer-reviewed
+ portable C++ source libraries. It includes libraries for linear algebra,
+ pseudorandom number generation, multithreading, image processing, regular
+ expressions and unit testing.
</para>
&lfs71_checked;
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-08-13 15:17:23 UTC (rev 10506)
+++ trunk/BOOK/general.ent 2012-08-13 16:01:55 UTC (rev 10507)
@@ -978,7 +978,7 @@
<!ENTITY AbiWord-version "2.8.6">
<!ENTITY gnumeric-version "1.10.17">
<!ENTITY gnucash-version "2.4.10">
-<!ENTITY libreoffice-version "3.5.4">
+<!ENTITY libreoffice-version "3.6.0">
<!-- <!ENTITY koffice-version "1.6.3">
<!ENTITY openoffice-version "3.2.1"> -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-08-13 15:17:23 UTC
(rev 10506)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-08-13 16:01:55 UTC
(rev 10507)
@@ -48,6 +48,9 @@
<para>August 13th, 2012</para>
<itemizedlist>
<listitem>
+ <para>[rthomsen] - LibreOffice 3.6.0.</para>
+ </listitem>
+ <listitem>
<para>[krejzi] - GnuTLS 3.0.22.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/kde/add/kdeadmin.xml
===================================================================
--- trunk/BOOK/kde/add/kdeadmin.xml 2012-08-13 15:17:23 UTC (rev 10506)
+++ trunk/BOOK/kde/add/kdeadmin.xml 2012-08-13 16:01:55 UTC (rev 10507)
@@ -29,9 +29,10 @@
<sect2 role="package">
<title>Introduction to Kdeadmin</title>
- <para>This package provides several administration tools for
<application>KDE
- </application>. These include a tool for managing users, a cron command
schedule editor,
- a printer administration tool and a log file viewer.</para>
+ <para>This package provides several administration tools for
+ <application>KDE</application>. These include a tool for managing users,
+ a cron command schedule editor, a printer administration tool and a log
+ file viewer.</para>
&lfs71_checked;
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
===================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml 2012-08-13 15:17:23 UTC (rev
10506)
+++ trunk/BOOK/xsoft/office/libreoffice.xml 2012-08-13 16:01:55 UTC (rev
10507)
@@ -5,15 +5,15 @@
%general-entities;
<!ENTITY libreoffice-core-download-http
-
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-version;.2.tar.xz";>
+
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-version;.4.tar.xz";>
<!ENTITY libreoffice-core-download-ftp " ">
- <!ENTITY libreoffice-core-md5sum "61afc900785dd7d071b96d9ab0af46f3">
- <!ENTITY libreoffice-core-size "99 MB">
- <!ENTITY libreoffice-buildsize "6.0 GB (345 MB installed)">
- <!ENTITY libreoffice-time "121 SBU">
+ <!ENTITY libreoffice-core-md5sum "67cf97e86c75363238a371f64ef5f606">
+ <!ENTITY libreoffice-core-size "102 MB">
+ <!ENTITY libreoffice-buildsize "7.1 GB (446 MB installed)">
+ <!ENTITY libreoffice-time "55 SBU">
]>
-<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;.2">
+<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
<?dbhtml filename="libreoffice.html"?>
<sect1info>
@@ -21,20 +21,19 @@
<date>$Date$</date>
</sect1info>
- <title>libreoffice-&libreoffice-version;.2</title>
+ <title>libreoffice-&libreoffice-version;</title>
<indexterm zone="libreoffice">
<primary sortas="a-libreoffice">libreoffice</primary>
</indexterm>
<sect2 role="package">
- <title>Introduction to Libre Office</title>
+ <title>Introduction to LibreOffice</title>
<para>
- <application>Libre Office</application> is a collection of programs for
- creating and editing office documents. It is largely compatible with
- <application>Microsoft Office</application> and
- <application>Open Office</application> on which it is based.
+ <application>LibreOffice</application> is a full-featured office suite.
+ It is largely compatible with <application>Microsoft Office</application>
+ and is descended from OpenOffice.org.
</para>
&lfs71_checked;
@@ -73,7 +72,7 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">Libre Office Dependencies</bridgehead>
+ <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
@@ -111,8 +110,9 @@
<xref linkend="libxml2"/> and <xref linkend="libxslt"/>,
<xref linkend="neon"/>,
<xref linkend="nss"/>,
- <xref linkend="openssl"/>,
- <xref linkend="poppler"/> and
+ <!-- LibreOffice 3.6.0.4 doesn't build with current poppler, using
internal version
+ <xref linkend="poppler"/>, -->
+ <xref linkend="openssl"/> and
<xref linkend="redland"/>.
</para>
@@ -133,11 +133,11 @@
</sect2>
<sect2 role="installation">
- <title>Installation of Libre Office</title>
+ <title>Installation of LibreOffice</title>
<warning>
<para>
- Untaring the libreoffice-core-&libreoffice-version;.2 tarball as
+ Untaring the libreoffice-core-&libreoffice-version;.4 tarball as
<systemitem class="username">root</systemitem> has the curious effect
of
changing the ownership of the <emphasis>parent</emphasis> directory
to a user with numerical id 11012 and with the permissions set to allow
@@ -160,15 +160,15 @@
</para>
</warning>
-<screen role="root"><userinput>tar -xf
libreoffice-core-&libreoffice-version;.2.tar.xz --no-overwrite-dir &&
-cd libreoffice-core-&libreoffice-version;.2</userinput></screen>
+<screen role="root"><userinput>tar -xf
libreoffice-core-&libreoffice-version;.4.tar.xz --no-overwrite-dir &&
+cd libreoffice-core-&libreoffice-version;.4</userinput></screen>
<para>
- Install <application>Libre Office</application> by running the following
+ Install <application>LibreOffice</application> by running the following
commands:
</para>
-<screen><userinput>sed -i 's# ORBit-2.0##' configure.in &&
+<screen><userinput>patch -Np1 -i
../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch &&
./autogen.sh --prefix=/usr \
--disable-binfilter \
--disable-gconf \
@@ -187,8 +187,7 @@
--with-system-libxml \
--with-system-neon \
--with-system-nss \
- --with-system-openssl \
- --with-system-poppler \
+ --with-system-openssl \<!-- - -with-system-poppler \ -->
--with-system-redland \
--with-system-zlib \
--without-java \
@@ -232,11 +231,11 @@
<title>Command Explanations</title>
<para>
- <command>sed -i 's# ORBit-2.0##' configure.in</command>: If you remove
the
- <option>--disable-gconf</option> configure will check for the deprecated
- ORBit. This sed removes the check for ORBit.
+ <command>patch -Np1 -i
+ ../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch</command>:
+ Fixes linking to <application>Boost</application> 1.50.
</para>
-
+
<para>
<option>--enable-gtk3</option>: Add this option if you've installed and
want to use <application>Gtk+-3</application>.
@@ -249,7 +248,7 @@
<para>
<option>--disable-binfilter</option>: These "binfilters" enable
- <application>Libre Office</application> to open legacy
+ <application>LibreOffice</application> to open legacy
<application>Star Office</application> format documents. Compiling
<application>binfilter</application> requires
<application>Java</application>.
@@ -257,40 +256,40 @@
<para>
<option>--disable-gconf</option>: Remove this option if you want to
- compile Libre Office with GConf support.
+ compile LibreOffice with GConf support.
</para>
<para>
<option>--disable-mozilla</option>: This option stops
- <application>Libre Office</application> trying to compile an old version
+ <application>LibreOffice</application> trying to compile an old version
of <application>SeaMonkey</application>.
</para>
<para>
<option>--disable-odk</option>: This option disables installing the
office development kit. Remove this option if you want to develop a
- <application>Libre Office</application> based application.
+ <application>LibreOffice</application> based application.
</para>
<para>
<option>--disable-postgresql-sdbc</option>: This option disables
compiling
- Libre Office with the ability to connect to a PostgreSQL database. If you
- would like Libre Office to be able to connect to a PostgreSQL database
+ LibreOffice with the ability to connect to a PostgreSQL database. If you
+ would like LibreOffice to be able to connect to a PostgreSQL database
remove this option. If you have installed PostgreSQL on your system and
- would like Libre Office to use that rather than compile its own copy, add
+ would like LibreOffice to use that rather than compile its own copy, add
the option <option>--with-system-postgresql</option>.
</para>
<para>
<option>--with-system- ...</option>: These options prevent
- <application>Libre Office</application> trying to compile its own
+ <application>LibreOffice</application> trying to compile its own
versions of these dependencies. If you've not installed
some of the dependencies, remove the corresponding option.
</para>
<para>
<option>--with-num-cpus=$(getconf _NPROCESSORS_ONLN)</option>: This
option
- tells <application>Libre Office</application> to use all your CPUs to
+ tells <application>LibreOffice</application> to use all your CPUs to
compile in parallel and speed up the build.
</para>
@@ -308,7 +307,7 @@
<para>
<option>--without-java</option>: This option compiles
- <application>Libre Office</application> without
+ <application>LibreOffice</application> without
<application>Java</application> support.
</para>
@@ -329,7 +328,7 @@
cp src/*.{xz,gz,txt,zip,bz2,tgz,jar,dll,oxt} src/*LICENSE*
../libreoffice-downloads</command>: this makes a backup copy
of the downloaded files so you don't have to download them again if you
- decide to recompile <application>Libre Office</application>. In that
case,
+ decide to recompile <application>LibreOffice</application>. In that case,
just start with:
<command>mkdir src; cp ../libreoffice-downloads/* src</command>
</para>
@@ -338,8 +337,8 @@
<command>for program in base calc draw impress math writer ...</command>:
These commands create 6 simple shell scripts in
<filename class="directory">/usr/bin</filename> that can be used to
launch
- <application>Libre Office</application> in its various forms. If you like
- seeing the <application>Libre Office</application> splash screen, remove
+ <application>LibreOffice</application> in its various forms. If you like
+ seeing the <application>LibreOffice</application> splash screen, remove
the "--nologo" option.
</para>
@@ -358,7 +357,7 @@
</sect2>
<sect2 role="configuration">
- <title>Configuring Libre Office</title>
+ <title>Configuring LibreOffice</title>
<para>
If you use a desktop environment like <application>Gnome</application>
@@ -373,7 +372,7 @@
Encoding=UTF-8
Type=Application
Name=${program^}
-Comment=Libre Office ${program^}
+Comment=LibreOffice ${program^}
Icon=${program}
Exec=${program}
Categories=Office;Application;
@@ -384,7 +383,7 @@
Encoding=UTF-8
Type=Application
Name=Printer Administration
-Comment=Libre Office Printer Administration
+Comment=LibreOffice Printer Administration
Icon=printeradmin
Exec=printeradmin
Categories=Office;Printing;Application;
@@ -398,7 +397,7 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
- <segtitle>Installed Directory</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
@@ -410,7 +409,7 @@
printeradmin and
writer.</seg>
<seg>
- Hundreds of shared libraries in
+ hundreds of shared libraries in
<filename class="directory">/usr/lib/libreoffice</filename>.
</seg>
<seg>/usr/lib/libreoffice.</seg>
@@ -500,7 +499,7 @@
<term><command>unopkg</command></term>
<listitem>
<para>
- is a tool to manage <application>Libre Office</application>
+ is a tool to manage <application>LibreOffice</application>
extensions from the command line.
</para>
<indexterm zone="libreoffice unopkg">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
