diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-java/swingx-ws | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-java/swingx-ws')
| -rw-r--r-- | dev-java/swingx-ws/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch | 40 | ||||
| -rw-r--r-- | dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild (renamed from dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild) | 15 |
3 files changed, 53 insertions, 5 deletions
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest index 29c0facf7da6..0468623b2614 100644 --- a/dev-java/swingx-ws/Manifest +++ b/dev-java/swingx-ws/Manifest @@ -1,3 +1,4 @@ +AUX swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch 1446 BLAKE2B 4abe6f6f22d46cc2f39720f43645098aad3b9e13ffeba1017dfb06e12f2acd1e3c7fa8e328ab421f24cc907dab223c6098fd65fbeeb500d178af75bab6429913 SHA512 5fe1b2af4834bd90183d9cbe0d697e5fbf22b6c401d7c2240fc1cdece71a24ed80ba8e4fbb3beeb4345761a51c1ee214f02206dac0efa1bf97a60523a39745d0 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da -EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a +EBUILD swingx-ws-1.0_p20110515-r2.ebuild 1873 BLAKE2B 194f550d73efec79aa9e06280cc1843e991251282dcf02918354a1887c0aa9633f0a4c9ec22f824079930580d63f92e76e8ff2a6ca130ca22f1c0b1cf1c88dd3 SHA512 083ecf5d235caa3a7bff4ba48184542192c4e25c1afc314ac964d7fe67e0c1230442c86f33fd9a79f4bb02ad68de7df277fee116bcc68323d8bc9775d60c1b78 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121 diff --git a/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch b/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch new file mode 100644 index 000000000000..f254274c62cc --- /dev/null +++ b/dev-java/swingx-ws/files/swingx-ws-1.0_p20110515-replace-sun.misc-classes-for-java-9+.patch @@ -0,0 +1,40 @@ +From 803016b9b4bd6cc96efb6cba8c37befaf410be61 Mon Sep 17 00:00:00 2001 +From: Yuan Liao <liaoyuan@gmail.com> +Date: Sun, 20 Feb 2022 11:07:41 -0800 +Subject: [PATCH] Replace use of sun.misc.BASE64{En,De}coder for Java 9+ + +Signed-off-by: Yuan Liao <liaoyuan@gmail.com> +--- + java/org/jdesktop/http/Request.java | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/java/org/jdesktop/http/Request.java b/java/org/jdesktop/http/Request.java +index ff72322..57c4bf8 100644 +--- a/java/org/jdesktop/http/Request.java ++++ b/java/org/jdesktop/http/Request.java +@@ -30,8 +30,7 @@ import org.jdesktop.beans.AbstractBean; + import org.jdesktop.http.Header.Element;
+ import org.jdesktop.xpath.XPathUtils;
+ import org.w3c.dom.Document;
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
++import java.util.Base64;
+
+ /**
+ * <p>Represents an http request. A <code>Request</code> is constructed and then
+@@ -613,10 +612,10 @@ public class Request extends AbstractBean { + }
+
+ private static String base64Encode(String s) throws Exception {
+- return new String(new BASE64Encoder().encode(s.getBytes()));
++ return Base64.getEncoder().encodeToString(s.getBytes());
+ }
+
+ private static String base64Decode(String s) throws Exception {
+- return new String(new BASE64Decoder().decodeBuffer(s));
++ return new String(Base64.getDecoder().decode(s));
+ }
+ }
+-- +2.34.1 + diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild index 2f0f79d05170..92355258c5ef 100644 --- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild +++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_P="${PN}-2011_05_15-src" JAVA_PKG_IUSE="doc source" @@ -16,6 +16,7 @@ SLOT="bt747" KEYWORDS="~amd64 ~x86" CP_DEPEND=" + dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 @@ -29,16 +30,22 @@ CP_DEPEND=" RDEPEND=" ${CP_DEPEND} - >=virtual/jre-1.6" + >=virtual/jre-1.8:*" DEPEND=" ${CP_DEPEND} - >=virtual/jdk-1.6 + >=virtual/jdk-1.8:*" + +BDEPEND=" app-arch/unzip" S="${WORKDIR}/${MY_P}/src" JAVA_SRC_DIR=( "beaninfo" "java" ) +PATCHES=( + "${FILESDIR}/${P}-replace-sun.misc-classes-for-java-9+.patch" +) + src_prepare() { default java-pkg_clean "${WORKDIR}" |