1 |
commit: cc67cd13dc32e350a03f875ce56dcd7b4e84510e |
2 |
Author: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Apr 1 20:51:37 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 11 09:51:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc67cd13 |
7 |
|
8 |
dev-java/gwt: bump to 2.9.0 |
9 |
|
10 |
This resolves the two bugs references below, but does not close them |
11 |
since they still exist in the older version of this ebuild. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/762619 |
14 |
Bug: https://bugs.gentoo.org/716220 |
15 |
Signed-off-by: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail.com> |
16 |
Closes: https://github.com/gentoo/gentoo/pull/20222 |
17 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
18 |
|
19 |
dev-java/gwt/Manifest | 2 + |
20 |
.../gwt/files/gwt-2.9.0-jsinterop-classpath.patch | 20 +++++ |
21 |
.../gwt/files/gwt-2.9.0-remove-git-usage.patch | 26 ++++++ |
22 |
dev-java/gwt/gwt-2.9.0.ebuild | 96 ++++++++++++++++++++++ |
23 |
4 files changed, 144 insertions(+) |
24 |
|
25 |
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest |
26 |
index 45f07b6b71d..6a0f247896b 100644 |
27 |
--- a/dev-java/gwt/Manifest |
28 |
+++ b/dev-java/gwt/Manifest |
29 |
@@ -1,2 +1,4 @@ |
30 |
DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074 |
31 |
+DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5 |
32 |
+DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b |
33 |
DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f |
34 |
|
35 |
diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch |
36 |
new file mode 100644 |
37 |
index 00000000000..5e69341210c |
38 |
--- /dev/null |
39 |
+++ b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch |
40 |
@@ -0,0 +1,20 @@ |
41 |
+# It's unclear how upstream gets their "dev.compile.test" target to compile |
42 |
+# without this - it could be that their testing is done with the local tools/ |
43 |
+# dir, and that some assumptions are made somewhere in the bulid system that |
44 |
+# don't apply when the tools dir is elsewhere. Either way, this fixes it. |
45 |
+# |
46 |
+# a Pull Request (of sorts) has been issued with upstream to incorporate this |
47 |
+# change. I would list the PR link here, but they use gerrit, and i don't |
48 |
+# understand what happened to my submission after I issued |
49 |
+# `git push upstream HEAD:refs/for/master` |
50 |
+ |
51 |
+--- a/dev/build.xml |
52 |
++++ b/dev/build.xml |
53 |
+@@ -60,6 +60,7 @@ |
54 |
+ <pathelement |
55 |
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/> |
56 |
+ <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/> |
57 |
++ <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/> |
58 |
+ <pathelement location="${alldeps.jar}"/> |
59 |
+ </classpath> |
60 |
+ </gwt.javac> |
61 |
|
62 |
diff --git a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch |
63 |
new file mode 100644 |
64 |
index 00000000000..9ebbafb9909 |
65 |
--- /dev/null |
66 |
+++ b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch |
67 |
@@ -0,0 +1,26 @@ |
68 |
+# This git stuff in the ant configs is useful during development, since it does |
69 |
+# something or other withe git revision and sets some sort of sentinel file. |
70 |
+# Since this package is for a release, we don't need it. |
71 |
+--- a/common.ant.xml |
72 |
++++ b/common.ant.xml |
73 |
+@@ -277,16 +277,16 @@ |
74 |
+ |
75 |
+ <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace"> |
76 |
+ <sequential> |
77 |
+- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> |
78 |
+- <arg line="rev-parse --short HEAD"/> |
79 |
+- </exec> |
80 |
++ <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> --> |
81 |
++ <!-- <arg line="rev-parse - -short HEAD"/> --> |
82 |
++ <!-- </exec> --> |
83 |
+ <!-- Generally, filtering requires a sentinel file so that changes to git rev will |
84 |
+ be noticed as invalidating the previously-generated filter output. This property |
85 |
+ names where such a sentinel lives; it is tested with <available/> and created |
86 |
+ with <touch/> --> |
87 |
+ <mkdir dir="${project.build}/sentinels"/> |
88 |
+ <property name="filter.sentinel" |
89 |
+- location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/> |
90 |
++ location="${project.build}/sentinels/gwt-${gwt.version}"/> |
91 |
+ </sequential> |
92 |
+ </macrodef> |
93 |
+ |
94 |
|
95 |
diff --git a/dev-java/gwt/gwt-2.9.0.ebuild b/dev-java/gwt/gwt-2.9.0.ebuild |
96 |
new file mode 100644 |
97 |
index 00000000000..b3a3173ebca |
98 |
--- /dev/null |
99 |
+++ b/dev-java/gwt/gwt-2.9.0.ebuild |
100 |
@@ -0,0 +1,96 @@ |
101 |
+# Copyright 1999-2021 Gentoo Authors |
102 |
+# Distributed under the terms of the GNU General Public License v2 |
103 |
+ |
104 |
+EAPI=7 |
105 |
+ |
106 |
+JAVA_PKG_IUSE="source" |
107 |
+ |
108 |
+inherit java-pkg-2 java-ant-2 java-utils-2 |
109 |
+ |
110 |
+GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1" |
111 |
+GWT_TOOLS_PN="tools" |
112 |
+ |
113 |
+DESCRIPTION="Google Web Toolkit library" |
114 |
+HOMEPAGE="http://www.gwtproject.org/" |
115 |
+SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
116 |
+ https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz" |
117 |
+# While the test suite does compile and does execute with an exit status of 0, |
118 |
+# there are many tests that end with FAILED status. It is unclear if this is |
119 |
+# expected from upstream or not, but in order to keep things honest, the test |
120 |
+# suite is being restricted |
121 |
+RESTRICT="mirror test" |
122 |
+SLOT="2.8" |
123 |
+LICENSE="Apache-2.0" |
124 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
125 |
+ |
126 |
+CDEPEND=" |
127 |
+ dev-java/json:0 |
128 |
+ dev-java/guava:20 |
129 |
+ dev-java/rhino:1.6 |
130 |
+ dev-java/asm:9 |
131 |
+ dev-java/eclipse-ecj:4.5 |
132 |
+ dev-java/validation-api:1.0 |
133 |
+" |
134 |
+ |
135 |
+RDEPEND=" |
136 |
+ ${CDEPEND} |
137 |
+ >=virtual/jre-1.8:*" |
138 |
+DEPEND=" |
139 |
+ ${CDEPEND} |
140 |
+ virtual/jdk:1.8 |
141 |
+" |
142 |
+ |
143 |
+JAVA_ANT_REWRITE_CLASSPATH="yes" |
144 |
+EANT_BUILD_TARGET="build" |
145 |
+EANT_GENTOO_CLASSPATH=" |
146 |
+ json |
147 |
+ asm-9 |
148 |
+ guava-20 |
149 |
+ rhino-1.6 |
150 |
+ eclipse-ecj-4.5 |
151 |
+ validation-api-1.0 |
152 |
+" |
153 |
+ |
154 |
+PATCHES=( |
155 |
+ "${FILESDIR}/${PN}-2.9.0-jsinterop-classpath.patch" |
156 |
+ "${FILESDIR}/${PN}-2.9.0-remove-git-usage.patch" |
157 |
+) |
158 |
+ |
159 |
+src_prepare() { |
160 |
+ default |
161 |
+ |
162 |
+ java-pkg-2_src_prepare |
163 |
+} |
164 |
+ |
165 |
+src_compile() { |
166 |
+ # the default setup assumes that you've placed these in ${S}/tools. We put |
167 |
+ # it in ${WORKDIR} though |
168 |
+ export GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" |
169 |
+ export GWT_VERSION="${PV}" |
170 |
+ |
171 |
+ java-pkg-2_src_compile |
172 |
+} |
173 |
+ |
174 |
+src_test() { |
175 |
+ local -x ANT_OPTS=-Dfile.encoding=UTF-8 |
176 |
+ local -x TZ=America/Los_Angeles |
177 |
+ |
178 |
+ java-pkg-2_src_test |
179 |
+} |
180 |
+ |
181 |
+src_install() { |
182 |
+ local i18nCreater_launcher_args=( |
183 |
+ i18nCreater |
184 |
+ --main com.google.gwt.i18n.tools.I18NCreater |
185 |
+ --jar gwt-dev.jar |
186 |
+ ) |
187 |
+ local webAppCreator_launcher_args=( |
188 |
+ webAppCreator |
189 |
+ --main com.google.gwt.user.tools.WebAppCreator |
190 |
+ --jar gwt-dev.jar |
191 |
+ ) |
192 |
+ |
193 |
+ java-pkg_dojar build/lib/*.jar |
194 |
+ java-pkg_dolauncher ${i18nCreater_launcher_args[@]} |
195 |
+ java-pkg_dolauncher ${webAppCreator_launcher_args[@]} |
196 |
+} |