[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-imaging/, dev-java/commons-imaging/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-imaging/, dev-java/commons-imaging/files/

[Miroslav Šulc]

commit:     24107635afda272d749d13cc45cf7fa785e966f9
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Nov 17 00:07:52 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 12:51:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24107635

dev-java/commons-imaging: patch failing javadoc

Closes: https://bugs.gentoo.org/861767
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild   | 11 ++++++++---
 .../files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch  | 12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
index 338fc76ea1a4..b1acc8ef4f3c 100644
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -14,6 +14,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library."
 HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
 SRC_URI="mirror://apache/commons/imaging/source/commons-imaging-${PV/_/-}-src.tar.gz"
+S="${WORKDIR}/${P/_/-}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -29,9 +30,13 @@ DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
-
-S="${WORKDIR}/${P/_/-}-src"
+PATCHES=( "${FILESDIR}/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch" )
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}

diff --git a/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch
new file mode 100644
index 000000000000..03f8074b8f3a
--- /dev/null
+++ b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/861767
+--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
++++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
+@@ -24,7 +24,7 @@ import org.apache.commons.imaging.common.BinaryFileParser;
+  * A PNG image is composed of several chunks. This is the base class for the chunks,
+  * used by the parser.
+  *
+- * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file>Portable_Network_Graphics</a>
++ * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file">Portable_Network_Graphics</a>
+  */
+ public class PngChunk extends BinaryFileParser {
+     public final int length;