diff options
Diffstat (limited to 'dev-java/zxing-javase')
| -rw-r--r-- | dev-java/zxing-javase/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/zxing-javase/files/3.5.1-test-available-formats.patch | 31 | ||||
| -rw-r--r-- | dev-java/zxing-javase/zxing-javase-3.5.1.ebuild | 11 |
3 files changed, 43 insertions, 2 deletions
diff --git a/dev-java/zxing-javase/Manifest b/dev-java/zxing-javase/Manifest index c93ce0615a26..9ffa9f4c03ea 100644 --- a/dev-java/zxing-javase/Manifest +++ b/dev-java/zxing-javase/Manifest @@ -1,3 +1,4 @@ +AUX 3.5.1-test-available-formats.patch 1070 BLAKE2B 6c5e38e4db4cb8399648ad2669bb34ced17e010bd309ff5dd359dd8315df12a116ec35b0db6555c63562e329e9d72078f1de17b87830d1e6fc2c90a535f22849 SHA512 7e44f569b354f1bb7fba815483edc67623a45c5f0cab300729db3d0193c06642343915554e31265509a0f20148d527346393058518245ecefd710e5adb0390fc DIST zxing-3.5.1.tar.gz 132915650 BLAKE2B f749de7db35f3ce56d80fb1aa547e65d57425a1d1e20dfd9b40e02e24c52e6f488ca26bf8e0217b7d65677441578bf67439ad3a1fca3155ab35598b6d9833ece SHA512 8c093e5b8e4d2cd01e8979b5e9f788ac32a8d0bb49f3c7ad42044e95bb4a352e66e2802f11ad7429ed6ba140b360c596f389cd721521b84a5a93918df19285de -EBUILD zxing-javase-3.5.1.ebuild 838 BLAKE2B 9dd3bb01ca00021fdf91e98ccf9b81341c97a5712b3b647a3652e9405cf3b1fb8afd706c21ae36469c1fd8520fa2cf3821a939e577ebff5070dcbdc367647a39 SHA512 d8b89fff2a1278feb2c70e349a8b99ad5aaa935946f97b4ce43b78530f39d719fc6efd9f973661c788efcedbb1ef1bfff9e969f9cdf012e84e7d3458dcf8516d +EBUILD zxing-javase-3.5.1.ebuild 964 BLAKE2B 8cd357345bb17faa396e97dacd8af2def0fe04b37a37b6970d31f115ce5ba5c0cdfef59a8c82742dc62bcdd8c044697a9477ee6d959846cc2e2d9f28f7df48dd SHA512 f6c414ee1a3cc90b841fa0a0c9184f52397971bf9c4496c14af4f4e94feba6c4cdc2ec161a22145ecda6059a120c29bb5133f00ba01c125ce371e9761c78a282 MISC metadata.xml 571 BLAKE2B 12b2e08bfaeadf4c0575f5a59b56761ca58067fd9ac353171301afce6d380964f9ff411678caee8eb50cbeb5fc66f98c5d8f7b184f8295a242e7a8f7f5f97e7f SHA512 6728b47f22d36df32848eaa681cb94e51162b369cfbd5de0f9985422c70a35ef65213a8dfb02761ee51e4477cbcd6d3d064871e9a27fec496724ce2678d5c23a 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 000000000000..62e154f0dad4 --- /dev/null +++ b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch @@ -0,0 +1,31 @@ +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 @@ + 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 6666b3db9dc2..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 +} |