linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 15:12:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates:

Browse Source 
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
This commit is contained in:
Pierre Labastie 2018-04-04 16:58:01 +00:00
parent 2faa98e38c
commit 488b738f41
7 changed files with 96 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general/genlib/icu.xml
View File

@ -7,10 +7,10 @@
<!ENTITY icu-download-http
"http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
<!ENTITY icu-download-ftp " ">
<!ENTITY icu-md5sum "43861b127744b3c0b9d7f386f4b9fa40">
<!ENTITY icu-md5sum "68fe38999fef94d622bd6843d43c0615">
<!ENTITY icu-size "22 MB">
<!ENTITY icu-buildsize "293 MB (add 33 MB for tests)">
<!ENTITY icu-time "0.4 SBU (using parallelism=4; add 1.4 SBU for tests)">
<!ENTITY icu-buildsize "330 MB (add 32 MB for tests)">
<!ENTITY icu-time "1.7 SBU (add 1.6 SBU for tests)">
]>
<sect1 id="icu" xreflabel="ICU-&icu-version;">

73
general/prog/apache-ant.xml
View File

@ -6,10 +6,10 @@
<!ENTITY apache-ant-download-http "https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz">
<!ENTITY apache-ant-download-ftp " ">
<!ENTITY apache-ant-md5sum "57235f3dccfc4b18a260862905ce6c04">
<!ENTITY apache-ant-size "3.6 MB">
<!ENTITY apache-ant-buildsize "262 MB">
<!ENTITY apache-ant-time "0.3 SBU (with a JVM using 4 cores)">
<!ENTITY apache-ant-md5sum "9db4b8ebdf3ee3a50aceb96ee6d54e6a">
<!ENTITY apache-ant-size "4.0 MB">
<!ENTITY apache-ant-buildsize "262 MB (not including downloaded files">
<!ENTITY apache-ant-time "0.3 SBU (with 4 cores; add download time)">
]>
<sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
@ -62,7 +62,7 @@
<para>Estimated build time: &apache-ant-time;</para>
</listitem>
</itemizedlist>
<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@ -90,7 +90,7 @@
</para>
</listitem>
</itemizedlist>
-->
<bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@ -111,7 +111,7 @@
<sect2 role="installation">
<title>Installation of Apache Ant</title>
<!--
<note><para>Several dependent packages have moved since the packaging of
<application>Ant</application> requiring download of the above extra files.
Copy those files into the source tree with the following
@ -121,24 +121,32 @@
../jai-codec-1.1.3.jar \
../xz-1.0.jar lib &amp;&amp;
unzip -p ../NetRexx-3.06-GA.zip lib/NetRexxC.jar > lib/NetRexxC.jar</userinput></screen>
<para>Build a limited bootstrap version of <application>Apache
Ant</application> using the following command:</para>
-->
<para>
Build a limited bootstrap version of <application>Apache
Ant</application> using the following command:
</para>
<screen><userinput>./bootstrap.sh</userinput></screen>
<para>Download the rest of the runtime dependencies using the
<filename>fetch.xml</filename> ant build script:</para>
<para>
Download the runtime dependencies using the
<filename>fetch.xml</filename> ant build script:
</para>
<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system || true &amp;&amp;
<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system &amp;&amp;
cp -v lib/*.jar lib/optional/</userinput></screen>
<para>Build <application>Apache Ant</application> by running the following
command:</para>
<para>
Build <application>Apache Ant</application> by running the following
command:
</para>
<screen><userinput>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; dist</userinput></screen>
<para>Install, as the <systemitem class="username">root</systemitem> user:</para>
<para>
Install, as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>cp -rv ant-&apache-ant-version; /opt/ &amp;&amp;
chown -R root:root /opt/ant-&apache-ant-version; &amp;&amp;
@ -149,18 +157,23 @@ ln -sfv ant-&apache-ant-version; /opt/ant</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para><command>bootstrap/bin/ant -f fetch.xml -Ddest=system ||
true</command>: These commands download the rest of the missing dependencies
into the source tree (in the <filename>lib/</filename> directory).</para>
<para>
<command>bootstrap/bin/ant -f fetch.xml -Ddest=system</command>:
Downloads the missing dependencies to user's home directory, and copy
them into the source tree (in the <filename>lib/</filename> directory).
</para>
<para><command>cp -v ... lib/optional</command>: This command copies the
previously downloaded jar files to the expected place in the source
tree so that <command>ant</command> picks them up at buld time.</para>
<para>
<command>cp -v ... lib/optional</command>: This command copies the
previously downloaded jar files to the expected place in the source
tree so that <command>ant</command> picks them up at buld time.
</para>
<para><command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
dist</command>: This command builds, tests, then
installs the package into
<filename class='directory'>a temporary directory.</filename>.</para>
<para>
<command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
dist</command>: This command builds, tests, then installs the package
into a temporary directory.
</para>
</sect2>
@ -221,8 +234,12 @@ EOF</userinput></screen>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py</seg>
<seg>ant*.jar</seg>
<seg>
ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py </seg>
<seg>
Numerous <filename>ant*.jar</filename> and dependant libraries in
<envar>$ANT_HOME</envar><filename>/lib</filename>
</seg>
<seg>/opt/ant-&apache-ant-version;</seg>
</seglistitem>
</segmentedlist>

27
general/prog/vala.xml
View File

@ -6,10 +6,10 @@
<!ENTITY vala-download-http "&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
<!ENTITY vala-download-ftp "&gnome-download-ftp;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
<!ENTITY vala-md5sum "cabefb88e75c4d729cdd2db4ba7eff13">
<!ENTITY vala-md5sum "e7d05683bcac0306fc8d7c875eb3fef1">
<!ENTITY vala-size "3.2 MB">
<!ENTITY vala-buildsize "111 MB (including tests)">
<!ENTITY vala-time "0.8 SBU (using parallelism=4; with tests)">
<!ENTITY vala-buildsize "142 MB (including tests)">
<!ENTITY vala-time "1.1 SBU (add 0.6 SBU for tests)">
]>
<sect1 id="vala" xreflabel="Vala-&vala-version;">
@ -149,28 +149,26 @@ make</userinput></screen>
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;
</seg>
<seg>
libvala-&vala-major-version;.so and
libvaladoc-&vala-major-version;.so
libvaladoc-&vala-major-version;.so (not built if the sed is applied)
</seg>
<seg>
/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;
</seg>
@ -208,6 +206,7 @@ make</userinput></screen>
</listitem>
</varlistentry>
<!--
<varlistentry id="vapicheck">
<term><command>vapicheck</command></term>
<listitem>
@ -218,7 +217,7 @@ make</userinput></screen>
<primary sortas="b-vapicheck">vapicheck</primary>
</indexterm>
</listitem>
</varlistentry>
</varlistentry>-->
<varlistentry id="vapigen">
<term><command>vapigen</command></term>

17
introduction/welcome/changelog.xml
View File

@ -44,6 +44,23 @@
<listitem>
<para>April 4, 2018</para>
<itemizedlist>
<listitem>
<para>[pierre] - Update to dovecot-2.3.1. Fixes
<ulink url="&blfs-ticket-root;10588">#10588</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Update to apache-ant-1.10.3. Fixes
<ulink url="&blfs-ticket-root;10586">#10586</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Update to vala-0.40.2. Fixes
<ulink url="&blfs-ticket-root;10582">#10582</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Update to icu-61.1. Add a switch to allow
building libreoffice with this version of icu. Fixes
<ulink url="&blfs-ticket-root;10581">#10581</ulink>.</para>
</listitem>
<listitem>
<para>[timtas] - Update to cups-filters-1.20.2. Fixes
<ulink url="&blfs-ticket-root;10612">#10612</ulink>.</para>

10
packages.ent
View File

@ -109,8 +109,8 @@
<!ENTITY grantlee-version "5.1.0">
<!ENTITY gsl-version "2.4">
<!ENTITY icu-major "60">
<!ENTITY icu-minor "2">
<!ENTITY icu-major "61">
<!ENTITY icu-minor "1">
<!ENTITY icu-patch "0">
<!ENTITY icu-version "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
<!ENTITY icu-dl-version "&icu-major;_&icu-minor;"><!-- _&icu-patch;-->
@ -340,11 +340,11 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY tcl-version "8.6.8">
<!ENTITY tk-version "8.6.8">
<!ENTITY vala-major-version "0.40"> <!-- even minors only -->
<!ENTITY vala-version "&vala-major-version;.0">
<!ENTITY vala-version "&vala-major-version;.2">
<!ENTITY valgrind-version "3.13.0">
<!ENTITY yasm-version "1.3.0">
<!ENTITY apache-ant-version "1.10.2">
<!ENTITY apache-ant-version "1.10.3">
<!ENTITY maven-version "3.5.3">
<!ENTITY junit-major "4">
<!ENTITY junit-version "4.12">
@ -501,7 +501,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!-- Chapter 21 -->
<!ENTITY dovecot-major "2">
<!ENTITY dovecot-minor "3">
<!ENTITY dovecot-micro "0.1">
<!ENTITY dovecot-micro "1">
<!ENTITY dovecot-version "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
<!ENTITY exim-version "4.90.1">

8
server/mail/dovecot.xml
View File

@ -7,10 +7,10 @@
<!ENTITY dovecot-download-http
"https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
<!ENTITY dovecot-download-ftp " ">
<!ENTITY dovecot-md5sum "865d6ad94c98ac3289fa06a77b1c014e">
<!ENTITY dovecot-size "6.2 MB">
<!ENTITY dovecot-buildsize "171 MB (add 6.8 MB for tests)">
<!ENTITY dovecot-time "1.2 SBU (add 0.2 SBU for tests)">
<!ENTITY dovecot-md5sum "fc89b6130bcc09e99ae21003b474acc2">
<!ENTITY dovecot-size "6.4 MB">
<!ENTITY dovecot-buildsize "173 MB (add 6.8 MB for tests)">
<!ENTITY dovecot-time "1.4 SBU (add 0.2 SBU for tests)">
]>
<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">

10
xsoft/office/libreoffice.xml
View File

@ -398,7 +398,7 @@ sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
Build the package:
</para>
<screen><userinput>make build-nocheck</userinput></screen>
<screen><userinput>CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make build-nocheck</userinput></screen>
<para>
Now, as the <systemitem class="username">root</systemitem> user:
@ -567,6 +567,14 @@ fi</userinput></screen>
dependencies, remove the corresponding switches.
</para>
<para>
<command>CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make ...</command>: <xref
linkend="icu"/> has removed an implicit namespace <quote>using</quote>
from its headers files. Setting <envar>U_USE_ICU_NAMESPACE</envar> to
1 allows to restore the former behavior, which is required for building
<application>libreoffice</application>.
</para>
<para>
<option>--with-parallelism=&lt;count&gt;</option>: This switch
tells <application>LibreOffice</application> to use &lt;count&gt; CPU