1 |
commit: 836a2c5ac06a69de6e9354b0a969f50c190b4ba5 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 17 19:25:27 2019 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 17 19:28:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836a2c5a |
7 |
|
8 |
dev-java/xerces: version bump. |
9 |
|
10 |
* Fetch sources from maven.org. |
11 |
* Clear QA warnings. |
12 |
* Switch build process to java-pkg-simple. |
13 |
* Knock together a patch to add missing overrides in required classes. |
14 |
* EAPI 6 bump whilst we're at it. |
15 |
|
16 |
Bug: https://bugs.gentoo.org/683350 |
17 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
18 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
19 |
|
20 |
dev-java/xerces/Manifest | 1 + |
21 |
.../xerces/files/xerces-2.12.0-overrides.patch | 66 ++++++++++++++++++++++ |
22 |
dev-java/xerces/xerces-2.12.0.ebuild | 47 +++++++++++++++ |
23 |
3 files changed, 114 insertions(+) |
24 |
|
25 |
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest |
26 |
index 8cf2dfb6b44..4c869cdd241 100644 |
27 |
--- a/dev-java/xerces/Manifest |
28 |
+++ b/dev-java/xerces/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411 |
31 |
+DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb |
32 |
|
33 |
diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch b/dev-java/xerces/files/xerces-2.12.0-overrides.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..2e31002065e |
36 |
--- /dev/null |
37 |
+++ b/dev-java/xerces/files/xerces-2.12.0-overrides.patch |
38 |
@@ -0,0 +1,66 @@ |
39 |
+--- a/org/apache/html/dom/HTMLIFrameElementImpl.java 2019-04-17 18:08:03.187783332 +0000 |
40 |
++++ b/org/apache/html/dom/HTMLIFrameElementImpl.java 2019-04-17 18:09:38.640274335 +0000 |
41 |
+@@ -17,6 +17,7 @@ |
42 |
+ package org.apache.html.dom; |
43 |
+ |
44 |
+ import org.w3c.dom.html.HTMLIFrameElement; |
45 |
++import org.w3c.dom.Document; |
46 |
+ |
47 |
+ /** |
48 |
+ * @xerces.internal |
49 |
+@@ -161,6 +162,11 @@ |
50 |
+ super( owner, name ); |
51 |
+ } |
52 |
+ |
53 |
++ @Override |
54 |
++ public Document getContentDocument() |
55 |
++ { |
56 |
++ return null; |
57 |
++ } |
58 |
+ |
59 |
+ } |
60 |
+ |
61 |
+--- a/org/apache/html/dom/HTMLFrameElementImpl.java 2019-04-17 19:14:06.833172177 +0000 |
62 |
++++ b/org/apache/html/dom/HTMLFrameElementImpl.java 2019-04-17 19:14:56.755428976 +0000 |
63 |
+@@ -17,6 +17,7 @@ |
64 |
+ package org.apache.html.dom; |
65 |
+ |
66 |
+ import org.w3c.dom.html.HTMLFrameElement; |
67 |
++import org.w3c.dom.Document; |
68 |
+ |
69 |
+ /** |
70 |
+ * @xerces.internal |
71 |
+@@ -138,6 +139,11 @@ |
72 |
+ super( owner, name ); |
73 |
+ } |
74 |
+ |
75 |
++ @Override |
76 |
++ public Document getContentDocument() |
77 |
++ { |
78 |
++ return null; |
79 |
++ } |
80 |
+ |
81 |
+ } |
82 |
+ |
83 |
+--- a/org/apache/html/dom/HTMLObjectElementImpl.java 2019-04-17 19:17:26.624199895 +0000 |
84 |
++++ b/org/apache/html/dom/HTMLObjectElementImpl.java 2019-04-17 19:19:23.691802087 +0000 |
85 |
+@@ -17,6 +17,7 @@ |
86 |
+ package org.apache.html.dom; |
87 |
+ |
88 |
+ import org.w3c.dom.html.HTMLObjectElement; |
89 |
++import org.w3c.dom.Document; |
90 |
+ |
91 |
+ /** |
92 |
+ * @xerces.internal |
93 |
+@@ -251,6 +252,11 @@ |
94 |
+ super( owner, name ); |
95 |
+ } |
96 |
+ |
97 |
++ @Override |
98 |
++ public Document getContentDocument() |
99 |
++ { |
100 |
++ return null; |
101 |
++ } |
102 |
+ |
103 |
+ } |
104 |
+ |
105 |
|
106 |
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild |
107 |
new file mode 100644 |
108 |
index 00000000000..1e27c4ffd23 |
109 |
--- /dev/null |
110 |
+++ b/dev-java/xerces/xerces-2.12.0.ebuild |
111 |
@@ -0,0 +1,47 @@ |
112 |
+# Copyright 1999-2019 Gentoo Authors |
113 |
+# Distributed under the terms of the GNU General Public License v2 |
114 |
+ |
115 |
+EAPI=6 |
116 |
+ |
117 |
+JAVA_PKG_IUSE="doc source" |
118 |
+ |
119 |
+inherit java-pkg-2 java-pkg-simple |
120 |
+ |
121 |
+MY_PN="xercesImpl" |
122 |
+MY_P="${MY_PN}-${PV}" |
123 |
+ |
124 |
+DESCRIPTION="Xerces Java XML parser" |
125 |
+HOMEPAGE="https://xml.apache.org/xerces2-j/index.html" |
126 |
+SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar" |
127 |
+ |
128 |
+LICENSE="Apache-2.0" |
129 |
+SLOT="2" |
130 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
131 |
+ |
132 |
+CDEPEND=" |
133 |
+ dev-java/xjavac:1 |
134 |
+ dev-java/xml-commons-resolver:0 |
135 |
+ dev-java/xml-commons-external:1.4" |
136 |
+ |
137 |
+RDEPEND=" |
138 |
+ ${CDEPEND} |
139 |
+ >=virtual/jre-1.6" |
140 |
+ |
141 |
+DEPEND=" |
142 |
+ ${CDEPEND} |
143 |
+ >=virtual/jdk-1.6" |
144 |
+ |
145 |
+JAVA_SRC_DIR="org" |
146 |
+ |
147 |
+JAVA_GENTOO_CLASSPATH=" |
148 |
+ xjavac-1 |
149 |
+ xml-commons-resolver |
150 |
+ xml-commons-external-1.4" |
151 |
+ |
152 |
+S="${WORKDIR}" |
153 |
+ |
154 |
+src_prepare() { |
155 |
+ default |
156 |
+ |
157 |
+ epatch "${FILESDIR}/${P}-overrides.patch" |
158 |
+} |