From cc9c6275dd6b071deef1a1682bb3926e1691cabb Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Fri, 11 Nov 2016 17:22:57 +0000 Subject: [PATCH] Update to libreoffice-5.2.3.3 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17948 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 4 +- introduction/welcome/changelog.xml | 12 ++++ packages.ent | 4 +- xsoft/office/libreoffice.xml | 88 +++++++++++++++--------------- 4 files changed, 59 insertions(+), 49 deletions(-) diff --git a/general.ent b/general.ent index 2c8ba056ab..e9bdf52b54 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index b6d1e161e3..1f3df44239 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -43,6 +43,18 @@ --> + + November 11th, 2016 + + + [pierre] - Update to libreoffice-5.2.3. Add a patch to + build with ICU-58.1. Recommend to build the Java backends, to allow + using lobase with the HSQLDB dirver. Fixes + #8503. + + + + November 9th, 2016 diff --git a/packages.ent b/packages.ent index 9b21cbd7ca..a6f10b58d3 100644 --- a/packages.ent +++ b/packages.ent @@ -681,8 +681,8 @@ - - + + diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml index 3a3dc6c4b4..9f51a3910b 100644 --- a/xsoft/office/libreoffice.xml +++ b/xsoft/office/libreoffice.xml @@ -7,24 +7,24 @@ - - + + - - + + - - + + - - + + - - + + ]> @@ -137,13 +137,13 @@ Translations size: &libreoffice-translations-size; - + LibreOffice Dependencies @@ -169,7 +169,7 @@ , - , + , , , , @@ -190,6 +190,7 @@ , , , + , (if connecting to an LDAP server), or , @@ -214,7 +215,6 @@ or MySQL, , , - , , , , @@ -321,12 +321,12 @@ ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external export LO_PREFIX=<PREFIX> - +patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-icu_58-1.patch Locales "fr" and "en-GB", you will find below, are just examples; you @@ -344,11 +344,6 @@ ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external -i bin/distro-install-desktop-integration && sed -e "/distro-install-file-lists/d" -i Makefile.in && - - - ./autogen.sh --prefix=$LO_PREFIX \ --sysconfdir=/etc \ @@ -357,7 +352,7 @@ chmod -v +x bin/unpack-sources && --> --with-help \ --with-myspell-dicts \ --with-alloc=system \ - --without-java \ + --without-junit \ --without-system-dicts \ --disable-dconf \ --disable-odk \ @@ -365,7 +360,7 @@ chmod -v +x bin/unpack-sources && --> --enable-release-build=yes \ --enable-python=system \ --with-system-apr \ - --with-system-boost=yes \ + --with-system-boost \ --with-system-cairo \ --with-system-clucene \ --with-system-curl \ @@ -409,8 +404,6 @@ chmod -v +x bin/unpack-sources && --> make distro-pack-install - If installed in - --with-system-boost=<yes/no>: - This switch enables/disables use of system boost, so bundled one may be or - not used, because currently, depending on the user decision, or if the - build is broken with latest Boost in BLFS, - which frequently occurs and there is a delay until either a fix is found - or it is fixed upstream. + --with-system-boost: This switch enables using + system boost. From time to time, recent versions of boost break + the build of libreoffice. In this case, it is possible to use the + bundled copy of boost, by removing this flag. @@ -526,17 +517,17 @@ fi - --without-system-dicts: This switch disables use - of dictionaries from system paths, so the ones installed by this package - are used. + --without-junit: This switch disables the HSQLDB + tests (the HSQLDB driver is written in Java). If you want to run the + tests, be sure to install junit.jar and + hamcrest.jar in /usr/share/java + . - --without-java: This switch disables - Java support in - LibreOffice. Remove this option if - Java is installed and needed. Most users will - not need Java in this application. + --without-system-dicts: This switch disables use + of dictionaries from system paths, so the ones installed by this package + are used. @@ -574,11 +565,10 @@ fi - --with-parallelism=<count>: This switch + : This switch tells LibreOffice to use <count> CPU cores to compile in parallel. (Do not include literal angle brackets.) - The default is $(getconf _NPROCESSORS_ONLN) which uses all availalble - cores on the system. + The default is to use all available cores on the system. @@ -630,6 +620,14 @@ fi versions. + + : This switch disables + Java support in + LibreOffice. Java is needed for the HSQLDB + driver, which allows reading databases created by other programs into + libreoffice base. + +