Mercurial > hg > icedtea8-forest
changeset 2665:1fde34a348a6
Merge jdk8u262-ga
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 04 Sep 2020 17:46:06 +0100 |
| parents | 55dd1d905935 (current diff) 94d3d8c74ed6 (diff) |
| children | d7694b240da4 |
| files | .hgtags common/autoconf/generated-configure.sh common/autoconf/toolchain.m4 |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 31 03:16:22 2020 +0100 +++ b/.hgtags Fri Sep 04 17:46:06 2020 +0100 @@ -1071,3 +1071,12 @@ bca1f7228ce8cf8b6fad5a278c1427c1763f1551 icedtea-3.16.0 bca1f7228ce8cf8b6fad5a278c1427c1763f1551 icedtea-3.17.0pre00 224893ede003ce1b059662471a1df462300dcd0e icedtea-3.17.0pre01 +3cf8935494d6ac06c3ecb495bf356fde94060496 jdk8u262-b01 +041cb274be1207a991e05b041f57a800e8132cff jdk8u262-b02 +908e7985b3393370a417db1254ab4585ea954b2f jdk8u262-b03 +e1a42471eb39cb9340608238cd67b1938f73632e jdk8u262-b04 +ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u262-b05 +2f973e405849e5e5fbe1b95ad1f37dc19cd046bc jdk8u262-b06 +4f5c1e68c85ec157a86505613e1aec3f4528957b jdk8u262-b07 +59b2de0b2c60f7ae444a43c76fc96260351172a3 jdk8u262-b08 +2bab25ddc567a2fe5038cb49cf5586dfb4c32ff2 jdk8u262-b09
--- a/THIRD_PARTY_README Mon Aug 31 03:16:22 2020 +0100 +++ b/THIRD_PARTY_README Fri Sep 04 17:46:06 2020 +0100 @@ -1643,7 +1643,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE ---
--- a/make/common/JavaCompilation.gmk Mon Aug 31 03:16:22 2020 +0100 +++ b/make/common/JavaCompilation.gmk Fri Sep 04 17:46:06 2020 +0100 @@ -222,7 +222,7 @@ $$($1_GREP_EXCLUDE_OUTPUT) $$(if $$($1_MANIFEST), \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ - -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ + -e "s#@@COMPANY_NAME@@#$$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ , \ $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)) $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))