From 488b738f41df2d9c03c3acf6f2e1c54c19310144 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 4 Apr 2018 16:58:01 +0000 Subject: [PATCH] Updates: icu-61.1, + modify libreoffice instructions to allow building with this version of icu vala-0.40.2 apache-ant-1.10.3 dovecot-2.3.1 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20036 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/icu.xml | 6 +-- general/prog/apache-ant.xml | 73 ++++++++++++++++++------------ general/prog/vala.xml | 27 ++++++----- introduction/welcome/changelog.xml | 17 +++++++ packages.ent | 10 ++-- server/mail/dovecot.xml | 8 ++-- xsoft/office/libreoffice.xml | 10 +++- 7 files changed, 96 insertions(+), 55 deletions(-) diff --git a/general/genlib/icu.xml b/general/genlib/icu.xml index 7b12cef386..468602e88b 100644 --- a/general/genlib/icu.xml +++ b/general/genlib/icu.xml @@ -7,10 +7,10 @@ - + - - + + ]> diff --git a/general/prog/apache-ant.xml b/general/prog/apache-ant.xml index ef6b45dd9e..2f80b16397 100644 --- a/general/prog/apache-ant.xml +++ b/general/prog/apache-ant.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -62,7 +62,7 @@ Estimated build time: &apache-ant-time; - + Apache Ant Dependencies Required @@ -111,7 +111,7 @@ Installation of Apache Ant - + + + Build a limited bootstrap version of Apache + Ant using the following command: + ./bootstrap.sh - Download the rest of the runtime dependencies using the - fetch.xml ant build script: + + Download the runtime dependencies using the + fetch.xml ant build script: + -bootstrap/bin/ant -f fetch.xml -Ddest=system || true && +bootstrap/bin/ant -f fetch.xml -Ddest=system && cp -v lib/*.jar lib/optional/ - Build Apache Ant by running the following - command: + + Build Apache Ant by running the following + command: + ./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; dist - Install, as the root user: + + Install, as the root user: + cp -rv ant-&apache-ant-version; /opt/ && chown -R root:root /opt/ant-&apache-ant-version; && @@ -149,18 +157,23 @@ ln -sfv ant-&apache-ant-version; /opt/ant Command Explanations - bootstrap/bin/ant -f fetch.xml -Ddest=system || - true: These commands download the rest of the missing dependencies - into the source tree (in the lib/ directory). + + bootstrap/bin/ant -f fetch.xml -Ddest=system: + Downloads the missing dependencies to user's home directory, and copy + them into the source tree (in the lib/ directory). + - cp -v ... lib/optional: This command copies the - previously downloaded jar files to the expected place in the source - tree so that ant picks them up at buld time. + + cp -v ... lib/optional: This command copies the + previously downloaded jar files to the expected place in the source + tree so that ant picks them up at buld time. + - ./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; - dist: This command builds, tests, then - installs the package into - a temporary directory.. + + ./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; + dist: This command builds, tests, then installs the package + into a temporary directory. + @@ -221,8 +234,12 @@ EOF Installed Directories - ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py - ant*.jar + + ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py + + Numerous ant*.jar and dependant libraries in + $ANT_HOME/lib + /opt/ant-&apache-ant-version; diff --git a/general/prog/vala.xml b/general/prog/vala.xml index c2b7df2a69..ca1623eca5 100644 --- a/general/prog/vala.xml +++ b/general/prog/vala.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -149,28 +149,26 @@ make vala, vala-&vala-major-version;, valac, - valadoc, - vala-gen-introspect, - vapicheck, and + valadoc (not built if the sed is applied), + vala-gen-introspect, and vapigen (symlinks); valac-&vala-major-version;, - valadoc-&vala-major-version;, - vala-gen-introspect-&vala-major-version;, - vapicheck-&vala-major-version;, and + valadoc-&vala-major-version; (not built if the sed is applied), + vala-gen-introspect-&vala-major-version;, and vapigen-&vala-major-version; libvala-&vala-major-version;.so and - libvaladoc-&vala-major-version;.so + libvaladoc-&vala-major-version;.so (not built if the sed is applied) /usr/include/vala-&vala-major-version;, - /usr/include/valadoc-&vala-major-version;, + /usr/include/valadoc-&vala-major-version; (not built if the sed is applied), /usr/lib/vala-&vala-major-version;, - /usr/lib/valadoc, + /usr/lib/valadoc (not built if the sed is applied), /usr/share/vala, - /usr/share/valadoc, + /usr/share/valadoc (not built if the sed is applied), /usr/share/devhelp/books/vala-&vala-major-version;, and /usr/share/vala-&vala-major-version; @@ -208,6 +206,7 @@ make + vapigen diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index db4dbb6690..c26489be47 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,23 @@ April 4, 2018 + + [pierre] - Update to dovecot-2.3.1. Fixes + #10588. + + + [pierre] - Update to apache-ant-1.10.3. Fixes + #10586. + + + [pierre] - Update to vala-0.40.2. Fixes + #10582. + + + [pierre] - Update to icu-61.1. Add a switch to allow + building libreoffice with this version of icu. Fixes + #10581. + [timtas] - Update to cups-filters-1.20.2. Fixes #10612. diff --git a/packages.ent b/packages.ent index 80b76950e4..167fa3ad6c 100644 --- a/packages.ent +++ b/packages.ent @@ -109,8 +109,8 @@ - - + + @@ -340,11 +340,11 @@ to avoid building libxml2 twice, which is slow with all deps --> - + - + @@ -501,7 +501,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + diff --git a/server/mail/dovecot.xml b/server/mail/dovecot.xml index 6ba4ec0d45..f0f5a63c69 100644 --- a/server/mail/dovecot.xml +++ b/server/mail/dovecot.xml @@ -7,10 +7,10 @@ - - - - + + + + ]> diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml index 0850bf6d9f..df4f09f755 100644 --- a/xsoft/office/libreoffice.xml +++ b/xsoft/office/libreoffice.xml @@ -398,7 +398,7 @@ sed -e "/distro-install-file-lists/d" -i Makefile.in && Build the package: -make build-nocheck +CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make build-nocheck Now, as the root user: @@ -567,6 +567,14 @@ fi dependencies, remove the corresponding switches. + + CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make ...: has removed an implicit namespace using + from its headers files. Setting U_USE_ICU_NAMESPACE to + 1 allows to restore the former behavior, which is required for building + libreoffice. + + : This switch tells LibreOffice to use <count> CPU