| 1 |
commit: 4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 11 13:25:21 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 11 13:25:35 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebaa7e5 |
| 7 |
|
| 8 |
dev-vcs/subversion: Fixed creation of docs with USE="java" (bug #551094). |
| 9 |
|
| 10 |
Thanks to Alexander Miller for providing a patch. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/subversion-1.8.16-javadoc-nolint.patch | 19 +++++++++++++++++++ |
| 16 |
dev-vcs/subversion/subversion-1.8.16.ebuild | 1 + |
| 17 |
dev-vcs/subversion/subversion-1.9.4.ebuild | 1 + |
| 18 |
3 files changed, 21 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..8b07d22 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch |
| 25 |
@@ -0,0 +1,19 @@ |
| 26 |
+With newer versions of javadoc (since JDK-1.8), "make doc-javahl" |
| 27 |
+reports many errors, causing build failures. Add "-Xdoclint:none" |
| 28 |
+option to restore old, sloppy behavior. |
| 29 |
+ |
| 30 |
+Patch created for subversion-1.8.16, should work for other other |
| 31 |
+versions, too. |
| 32 |
+See <https://bugs.gentoo.org/show_bug.cgi?id=551094> |
| 33 |
+ |
| 34 |
+--- a/Makefile.in |
| 35 |
++++ b/Makefile.in |
| 36 |
+@@ -650,7 +650,7 @@ |
| 37 |
+ |
| 38 |
+ # Generate API documentation for the JavaHL package. |
| 39 |
+ doc-javahl: |
| 40 |
+- $(JAVADOC) -d $(abs_builddir)/doc/javadoc \ |
| 41 |
++ $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \ |
| 42 |
+ -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \ |
| 43 |
+ -link http://java.sun.com/javase/6/docs/api/ \ |
| 44 |
+ org.tigris.subversion.javahl \ |
| 45 |
|
| 46 |
diff --git a/dev-vcs/subversion/subversion-1.8.16.ebuild b/dev-vcs/subversion/subversion-1.8.16.ebuild |
| 47 |
index c4edce6..afae86f 100644 |
| 48 |
--- a/dev-vcs/subversion/subversion-1.8.16.ebuild |
| 49 |
+++ b/dev-vcs/subversion/subversion-1.8.16.ebuild |
| 50 |
@@ -70,6 +70,7 @@ PATCHES=( |
| 51 |
"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch |
| 52 |
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch |
| 53 |
"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch |
| 54 |
+ "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch |
| 55 |
) |
| 56 |
|
| 57 |
want_apache |
| 58 |
|
| 59 |
diff --git a/dev-vcs/subversion/subversion-1.9.4.ebuild b/dev-vcs/subversion/subversion-1.9.4.ebuild |
| 60 |
index ced9e81..df0bcd1 100644 |
| 61 |
--- a/dev-vcs/subversion/subversion-1.9.4.ebuild |
| 62 |
+++ b/dev-vcs/subversion/subversion-1.9.4.ebuild |
| 63 |
@@ -70,6 +70,7 @@ PATCHES=( |
| 64 |
"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch |
| 65 |
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch |
| 66 |
"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch |
| 67 |
+ "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch |
| 68 |
) |
| 69 |
|
| 70 |
want_apache |
Archives