Author: renodr
Date: Sat Feb 2 18:27:24 2019
New Revision: 21078
Log:
Adapt Libreoffice to changes in JDK11
Minor stylistic changes to subversion
OpenJDK: Add comment about test suite failures
Java: Regenerate i686 binary for +9
Modified:
trunk/BOOK/general/prog/java.xml
trunk/BOOK/general/prog/openjdk.xml
trunk/BOOK/general/prog/subversion.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/xsoft/office/libreoffice.xml
Modified: trunk/BOOK/general/prog/java.xml
==============================================================================
--- trunk/BOOK/general/prog/java.xml Sat Feb 2 14:17:24 2019 (r21077)
+++ trunk/BOOK/general/prog/java.xml Sat Feb 2 18:27:24 2019 (r21078)
@@ -8,12 +8,14 @@
the directory: this saves more than 70 MB. -->
<!ENTITY anduin-download
"&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
<!ENTITY openjdk-download-binary-x86
"&anduin-download;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
- <!ENTITY openjdk-bin-md5sum-x86 "9e7907a5cde056649844ec07602f4b2a">
- <!ENTITY openjdk-bin-size-x86 "143 MB">
+ <!ENTITY openjdk-bin-md5sum-x86 "2b917647040e9804e0f3ccd51f40394b">
+ <!ENTITY openjdk-bin-size-x86 "158 MB">
<!ENTITY openjdk-bin-buildsize-x86 "273 MB">
<!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
licence.-->
+<!-- I've crafted a binary in case the version is removed from Oracle after
+ BLFS 8.4 is released. -->
<!ENTITY openjdk-download-binary-x64
"https://download.java.net/java/GA/jdk11/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz";>
<!ENTITY openjdk-bin-md5sum-x64 "ce52c5844200c569a50a869e579d88f6">
<!ENTITY openjdk-bin-size-x64 "179 MB">
Modified: trunk/BOOK/general/prog/openjdk.xml
==============================================================================
--- trunk/BOOK/general/prog/openjdk.xml Sat Feb 2 14:17:24 2019 (r21077)
+++ trunk/BOOK/general/prog/openjdk.xml Sat Feb 2 18:27:24 2019 (r21078)
@@ -48,15 +48,7 @@
</para>
&lfs83_checked;
-<!--
- <note>
- <para>
- A browser plugin and webstart implementation is provided by the
- Icedtea project. To provide a complete implementation, you will
- need to later install <xref linkend="icedtea-web"/>.
- </para>
- </note>
--->
+
<para>
OpenJDK is GPL'd code, with a special exception made for non-free
projects to use these classes in their proprietary products.
@@ -262,6 +254,9 @@
<filename>JTreport/test_{jdk,langtools}/text/stats.txt</filename> and
<filename>JTreport/test_{jdk,langtools}/text/summary.txt</filename>.
You should expect to see around 40 failures and a couple of errors.</para>
+ <!-- for x86_64: 2 Errors, 28 Failures
+ for i686: 13 Errors, 48 Failures
+ Updated for JDK-11.0.2+9 by renodr -->
<para>Install the package with the following commands as the
<systemitem class="username">root</systemitem> user:</para>
Modified: trunk/BOOK/general/prog/subversion.xml
==============================================================================
--- trunk/BOOK/general/prog/subversion.xml Sat Feb 2 14:17:24 2019
(r21077)
+++ trunk/BOOK/general/prog/subversion.xml Sat Feb 2 18:27:24 2019
(r21078)
@@ -231,7 +231,7 @@
<systemitem class="username">root</systemitem> user to install them:
</para>
<para>
- <screen> <command>make install-javahl</command></screen>
+<screen><command>make install-javahl</command></screen>
</para>
<para>
@@ -242,7 +242,7 @@
to install them:
</para>
<para>
- <screen><command>make install-swig-pl</command>
+<screen><command>make install-swig-pl</command>
<command>make install-swig-py \
swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Feb 2 14:17:24
2019 (r21077)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Feb 2 18:27:24
2019 (r21078)
@@ -46,6 +46,14 @@
<para>February 2nd, 2019</para>
<itemizedlist>
<listitem>
+ <para>[renodr] - Update the OpenJDK binary for i686 to patch level
+ 9. This prevents a version mismatch.</para>
+ </listitem>
+ <listitem>
+ <para>[renodr] - Adapt Libreoffice to changes in OpenJDK-11.x. Fixes
+ <ulink url="&blfs-ticket-root;11611">#11611</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Update to mercurial-4.9. Fixes
<ulink url="&blfs-ticket-root;11621">#11621</ulink>.</para>
</listitem>
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Sat Feb 2 14:17:24 2019
(r21077)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Sat Feb 2 18:27:24 2019
(r21078)
@@ -156,6 +156,13 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ Required patch to allow building against <xref linkend="openjdk"/>:
+ <ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-jdk11_fixes-1.patch"/>
+ </para>
+ </listitem>
+
</itemizedlist>
<bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
@@ -306,6 +313,14 @@
<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
<para>
+ Fix a build failure introduced by recent versions of
+ <xref linkend="openjdk"/>:
+ <!-- Needed for OpenJDK-11.0.2+7 AND 9 - removed method calls -->
+ </para>
+
+<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-jdk11_fixes-1.patch</userinput></screen>
+
+ <para>
Create symlinks to tarballs from the source directory so they won't
get downloaded again:
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
