[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/, dev-java/zxing-javase/files/
commit: 4726fafc27371a5c8b627274f8e9ab8768286483 Author: Valérian Rousset users noreply github com> AuthorDate: Thu Jul 20 21:46:18 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jul 20 22:31:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4726fafc dev-java/zxing-javase: fix tests on openjdk:8 Closes: https://bugs.gentoo.org/910497 Signed-off-by: Valérian Rousset users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/31979 Signed-off-by: Sam James gentoo.org> .../files/3.5.1-test-available-formats.patch | 29 ++ dev-java/zxing-javase/zxing-javase-3.5.1.ebuild| 11 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch new file mode 100644 index ..aa4101749419 --- /dev/null +++ b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch @@ -0,0 +1,29 @@ +--- a/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java b/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java +@@ -17,7 +17,9 @@ + package com.google.zxing.client.j2se; + + import com.google.zxing.common.BitMatrix; ++import static org.hamcrest.CoreMatchers.hasItem; + import org.junit.Assert; ++import static org.junit.Assume.assumeThat; + import org.junit.Test; + + import javax.imageio.ImageIO; +@@ -25,6 +27,7 @@ + import java.io.IOException; + import java.nio.file.Files; + import java.nio.file.Path; ++import java.util.Arrays; + + /** + * Tests {@link MatrixToImageWriter}. +@@ -52,6 +55,8 @@ private static void doTest(MatrixToImageConfig config) throws IOException { + } + + private static void doTestFormat(String format, MatrixToImageConfig config) throws IOException { ++assumeThat(Arrays.asList(ImageIO.getWriterFormatNames()), hasItem(format)); ++ + int width = 2; + int height = 3; + BitMatrix matrix = new BitMatrix(width, height); diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild index b3db9dc2..ef015da75c4b 100644 --- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild +++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild @@ -10,7 +10,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Core barcode encoding/decoding library" -HOMEPAGE="https://github.com/zxing/zxing/core"; +HOMEPAGE="https://github.com/zxing/zxing"; SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"; LICENSE="Apache-2.0" SLOT="3" @@ -31,7 +31,16 @@ RDEPEND=" S="${WORKDIR}/zxing-zxing-${PV}/javase" +PATCHES=( + "${FILESDIR}/${PV}-test-available-formats.patch" +) + JAVA_AUTOMATIC_MODULE_NAME="com.google.zxing.javase" JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default # apply PATCHES + java-pkg-2_src_prepare +}
[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/files/
commit: afe31e34a4e274257e697267dab230578c12bfd4 Author: Sam James gentoo org> AuthorDate: Thu Jul 20 22:32:31 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jul 20 22:32:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe31e34 dev-java/zxing-javase: add upstream/bug link to patch Signed-off-by: Sam James gentoo.org> dev-java/zxing-javase/files/3.5.1-test-available-formats.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch index aa4101749419..62e154f0dad4 100644 --- a/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch +++ b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch @@ -1,3 +1,5 @@ +https://github.com/zxing/zxing/pull/1668 +https://bugs.gentoo.org/910497 --- a/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java +++ b/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java @@ -17,7 +17,9 @@
[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/
commit: f9b13143b5fa8a31ad5c4850d3fd65a9f08e3d07 Author: Sam James gentoo org> AuthorDate: Tue Jul 18 17:20:37 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jul 18 17:20:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b13143 dev-java/zxing-javase: Keyword 3.5.1 arm, #906822 Signed-off-by: Sam James gentoo.org> dev-java/zxing-javase/zxing-javase-3.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild index f30b5117967c..b3db9dc2 100644 --- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild +++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/zxing/zxing/core"; SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"; LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" CP_DEPEND=" dev-java/jcommander:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/
commit: d6c542782967debebcf87586c46860e557879a9b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jul 15 13:15:23 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jul 15 13:15:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c54278 dev-java/zxing-javase: Stabilize 3.5.1 amd64, #910387 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/zxing-javase/zxing-javase-3.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild index 71d865b48108..44cc92e0948f 100644 --- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild +++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/zxing/zxing/core"; SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"; LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" CP_DEPEND=" dev-java/jcommander:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/
commit: 341eac1d179e4e12a735327797f33d0fd2530c75 Author: Sam James gentoo org> AuthorDate: Sun May 21 05:41:16 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 21 05:41:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341eac1d dev-java/zxing-javase: update maintainers Signed-off-by: Sam James gentoo.org> dev-java/zxing-javase/metadata.xml | 8 1 file changed, 8 insertions(+) diff --git a/dev-java/zxing-javase/metadata.xml b/dev-java/zxing-javase/metadata.xml index d915f211153b..c77bb25a2b63 100644 --- a/dev-java/zxing-javase/metadata.xml +++ b/dev-java/zxing-javase/metadata.xml @@ -1,10 +1,18 @@ https://www.gentoo.org/dtd/metadata.dtd";> + + thar...@gmail.com + Valérian Rousset + j...@gentoo.org Java + + proxy-ma...@gentoo.org + Proxy Maintainers + zxing/zxing
[gentoo-commits] repo/gentoo:master commit in: dev-java/zxing-javase/
commit: 3469e56a225c911e4a6a2a7d24151bd575943435 Author: Valérian Rousset users noreply github com> AuthorDate: Mon May 8 21:30:53 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 20 09:21:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3469e56a dev-java/zxing-javase: new package, add 3.5.1 Signed-off-by: Valérian Rousset users.noreply.github.com> Signed-off-by: Sam James gentoo.org> dev-java/zxing-javase/Manifest | 1 + dev-java/zxing-javase/metadata.xml | 11 dev-java/zxing-javase/zxing-javase-3.5.1.ebuild | 37 + 3 files changed, 49 insertions(+) diff --git a/dev-java/zxing-javase/Manifest b/dev-java/zxing-javase/Manifest new file mode 100644 index ..e80a49af97f5 --- /dev/null +++ b/dev-java/zxing-javase/Manifest @@ -0,0 +1 @@ +DIST zxing-3.5.1.tar.gz 132915650 BLAKE2B f749de7db35f3ce56d80fb1aa547e65d57425a1d1e20dfd9b40e02e24c52e6f488ca26bf8e0217b7d65677441578bf67439ad3a1fca3155ab35598b6d9833ece SHA512 8c093e5b8e4d2cd01e8979b5e9f788ac32a8d0bb49f3c7ad42044e95bb4a352e66e2802f11ad7429ed6ba140b360c596f389cd721521b84a5a93918df19285de diff --git a/dev-java/zxing-javase/metadata.xml b/dev-java/zxing-javase/metadata.xml new file mode 100644 index ..d915f211153b --- /dev/null +++ b/dev-java/zxing-javase/metadata.xml @@ -0,0 +1,11 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + + j...@gentoo.org + Java + + + zxing/zxing + + diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild new file mode 100644 index ..71d865b48108 --- /dev/null +++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.zxing:javase:3.5.1" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core barcode encoding/decoding library" +HOMEPAGE="https://github.com/zxing/zxing/core"; +SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"; +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~x86" + +CP_DEPEND=" + dev-java/jcommander:0 + dev-java/zxing-core:3 +" +DEPEND=" + ${CP_DEPEND} + >=virtual/jdk-1.8:* +" +RDEPEND=" + ${CP_DEPEND} + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/zxing-zxing-${PV}/javase" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.zxing.javase" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java"