From 6bce421f1ecc30a58b64f9771081403d80213a9f5ef9aaf9ee51653561de81b9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 3 Jun 2016 09:08:17 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=164

---
 disable-doclint-by-default.patch | 58 ++++++++++++++++++++++++++++++++
 java-1_8_0-openjdk.changes       | 13 +++++++
 java-1_8_0-openjdk.spec          |  2 ++
 3 files changed, 73 insertions(+)
 create mode 100644 disable-doclint-by-default.patch

diff --git a/disable-doclint-by-default.patch b/disable-doclint-by-default.patch
new file mode 100644
index 0000000..01f18f5
--- /dev/null
+++ b/disable-doclint-by-default.patch
@@ -0,0 +1,58 @@
+Disable doclint by default
+
+OpenJDK 8 adds and enables doclint by default. This catches issues in
+javadoc comments. It is too strict, breaks javadoc compilation and, in
+general, breaks the build for old code known to build with previous
+versions of OpenJDK.
+
+See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
+See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
+
+Author: Andrew John Hughes <ahughes@redhat.com>
+Author: Emmanuel Bourg <ebourg@apache.org>
+--- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+@@ -811,10 +811,9 @@
+             doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
+         }
+ 
+-        if (doclintOpts.isEmpty()) {
+-            doclintOpts.add(DocLint.XMSGS_OPTION);
+-        } else if (doclintOpts.size() == 1
+-                && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
++        if (doclintOpts.isEmpty() ||
++	    (doclintOpts.size() == 1
++	     && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) {
+             return;
+         }
+ 
+--- openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
+@@ -130,12 +130,12 @@
+         };
+ 
+         test(Collections.<String>emptyList(),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList(rawDiags),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList("-Xdoclint:none"),
+                 Main.Result.OK,
+@@ -158,8 +158,8 @@
+                 EnumSet.of(Message.DL_WRN12));
+ 
+         test(Arrays.asList(rawDiags, "-private"),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
+                 Main.Result.ERROR,
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 24768b6..93b7c45 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jun  3 09:01:23 UTC 2016 - fstrba@suse.com
+
+- Added patch:
+  * disable-doclint-by-default-patch
+    - Disable Doclint while building javadoc by default. OpenJDK 8
+      adds and enables doclint by default. This catches issues in
+      javadoc comments. It is too strict, breaks javadoc compilation
+      and, in general, breaks the build for old code known to build
+      with previous versions of OpenJDK.
+- Cycle make on i586 in order to prevent some random build errors
+  that are not easily reproduceable and thus fixable.
+
 -------------------------------------------------------------------
 Tue May 31 06:47:43 UTC 2016 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 2a44a7a..36078c6 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -184,6 +184,7 @@ Patch103:       ppc-zero-hotspot.patch
 Patch1000:      icedtea-3.0.1-sunec.patch
 Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch2000:      java-1_8_0-openjdk-gcc6.patch
+Patch2001:      disable-doclint-by-default.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -498,6 +499,7 @@ patch -p0 -i %{PATCH103}
 %endif
 
 patch -p0 -i %{PATCH2000}
+patch -p0 -i %{PATCH2001}
 
 (cd openjdk/common/autoconf
  bash ./autogen.sh