diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-java/gwt/files | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'dev-java/gwt/files')
| -rw-r--r-- | dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch | 20 | ||||
| -rw-r--r-- | dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch | 26 |
2 files changed, 46 insertions, 0 deletions
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 new file mode 100644 index 000000000000..5e69341210cf --- /dev/null +++ b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch @@ -0,0 +1,20 @@ +# It's unclear how upstream gets their "dev.compile.test" target to compile +# without this - it could be that their testing is done with the local tools/ +# dir, and that some assumptions are made somewhere in the bulid system that +# don't apply when the tools dir is elsewhere. Either way, this fixes it. +# +# a Pull Request (of sorts) has been issued with upstream to incorporate this +# change. I would list the PR link here, but they use gerrit, and i don't +# understand what happened to my submission after I issued +# `git push upstream HEAD:refs/for/master` + +--- a/dev/build.xml ++++ b/dev/build.xml +@@ -60,6 +60,7 @@ + <pathelement + location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/> + <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/> ++ <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/> + <pathelement location="${alldeps.jar}"/> + </classpath> + </gwt.javac> 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 new file mode 100644 index 000000000000..9ebbafb99099 --- /dev/null +++ b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch @@ -0,0 +1,26 @@ +# This git stuff in the ant configs is useful during development, since it does +# something or other withe git revision and sets some sort of sentinel file. +# Since this package is for a release, we don't need it. +--- a/common.ant.xml ++++ b/common.ant.xml +@@ -277,16 +277,16 @@ + + <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace"> + <sequential> +- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> +- <arg line="rev-parse --short HEAD"/> +- </exec> ++ <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> --> ++ <!-- <arg line="rev-parse - -short HEAD"/> --> ++ <!-- </exec> --> + <!-- Generally, filtering requires a sentinel file so that changes to git rev will + be noticed as invalidating the previously-generated filter output. This property + names where such a sentinel lives; it is tested with <available/> and created + with <touch/> --> + <mkdir dir="${project.build}/sentinels"/> + <property name="filter.sentinel" +- location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/> ++ location="${project.build}/sentinels/gwt-${gwt.version}"/> + </sequential> + </macrodef> + |