[java-1.8.0-openjdk/f20] Disable doclint for compatibility added and applied Patch6: disable-doclint-by-default.patch

[jiri vanek]

commit 6683cfbe5ac6eb6f9b87522d8d6ef710ce9d6da3
Author: Jiri <jvanek at redhat.com>
Date:   Fri May 16 14:46:56 2014 +0200

    Disable doclint for compatibility
    added and applied Patch6: disable-doclint-by-default.patch

 disable-doclint-by-default.patch |   58 ++++++++++++++++++++++++++++++++++++++
 java-1.8.0-openjdk.spec          |    9 +++++-
 2 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/disable-doclint-by-default.patch b/disable-doclint-by-default.patch
new file mode 100644
index 0000000..11e7896
--- /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 at redhat.com>
+Author: Emmanuel Bourg <ebourg at apache.org>
+--- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ jdk8/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;
+         }
+ 
+--- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ jdk8/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.spec b/java-1.8.0-openjdk.spec
index 92cc03c..4335d66 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -128,7 +128,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}%{?dist}
+Release: 3.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -190,6 +190,8 @@ Patch3: java-atk-wrapper-security.patch
 Patch4: PStack-808293.patch
 # Allow multiple initialization of PKCS11 libraries
 Patch5: multiple-pkcs11-library-init.patch
+# Disable doclint for compatibility
+Patch6: disable-doclint-by-default.patch
 
 #
 # OpenJDK specific patches
@@ -418,6 +420,7 @@ sh %{SOURCE12}
 %patch3
 %patch4
 %patch5
+%patch6
 
 %patch99
 
@@ -1082,6 +1085,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri May 16 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.5-3.b13
+- Disable doclint for compatiblity
+- Patch contributed by Andrew John Hughes
+
 * Wed Apr 23 2014 Omair Majid <omajid at redhat.com> - 1:1.8.0.5-2.b13
 - Change make flags to fix debuginfo generation
 - Fix suggested by Yasumasa Suenaga