Merge mips64el-jdk8u222-b11

Thu, 05 Sep 2019 18:50:55 +0800

author
aoqi
date
Thu, 05 Sep 2019 18:50:55 +0800
changeset 1926
a64d826ebca9
parent 1904
e6d45bb532c0
parent 1925
d44170c2cece
child 1927
dbcfc7479c25

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Sep 05 18:40:51 2019 +0800
     1.2 +++ b/.hgtags	Thu Sep 05 18:50:55 2019 +0800
     1.3 @@ -1040,7 +1040,20 @@
     1.4  e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26
     1.5  6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga
     1.6  2a7ec282f0ce1523347a9c9e08189139bfc097db jdk8u212-b00
     1.7 +e41d4e43109e239cd13219b53798fdad651f63ef jdk8u222-b00
     1.8  e41d4e43109e239cd13219b53798fdad651f63ef jdk8u212-b01
     1.9  5d11a79b0bf5560625ec67efd40e9167a594b00d jdk8u212-b02
    1.10 +b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-b03
    1.11 +7bcc11914fc5d23b20b9ee7fed6abc140eaab2cf jdk8u212-b04
    1.12 +b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-ga
    1.13  5ff6d6bb688cc37a418e4c34e3e734458a43e8c5 mips64el-jdk8u212-b04
    1.14  72a800baa5345a7de59d9efefc0719ecd3a624f4 mips64el-jdk8u212-b05
    1.15 +84cd6d251c41e399b526a39da5cd2dea3efe5ff6 jdk8u222-b01
    1.16 +0c183329d0f6f692c6175afe13f8b1434152d381 jdk8u222-b02
    1.17 +4c7079509eecb3127b5ddae9454dd6aab5a23e4d jdk8u222-b03
    1.18 +1b43db192b995f83f540a68363e13a633aac25f4 jdk8u222-b04
    1.19 +5837b825d94bd4fbc1bff28099810e8bcb1e848a jdk8u222-b05
    1.20 +74bdd387f873523cae121fa48056fb662e289679 jdk8u222-b06
    1.21 +3abf299d26c40608af206c3b43c35b7ab2aade07 jdk8u222-b07
    1.22 +d8e58175603e92f46baa775c878cf346181cafed jdk8u222-b08
    1.23 +60d5ceb1043500475c41501de673b9582ef4d97b jdk8u222-b09
     2.1 --- a/THIRD_PARTY_README	Thu Sep 05 18:40:51 2019 +0800
     2.2 +++ b/THIRD_PARTY_README	Thu Sep 05 18:50:55 2019 +0800
     2.3 @@ -1612,7 +1612,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, 
     2.8 +%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1682,7 +1682,7 @@
    2.13  --- begin of LICENSE ---
    2.14  
    2.15   Mesa 3-D graphics library
    2.16 - Version:  4.1
    2.17 + Version:  5.0
    2.18  
    2.19   Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
    2.20  
    2.21 @@ -2797,61 +2797,8 @@
    2.22  not be used in advertising or otherwise to promote the sale, use or
    2.23  other dealings in this Software without prior written authorization
    2.24  from the X Consortium.
    2.25 -___________________________
    2.26 -The files in motif/lib/Xm/util included this copyright:mkdirhier.man,
    2.27 -xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man, 
    2.28 -checktree.c, lndir.c, makestrs.c
    2.29 -Copyright (c) 1993, 1994 X Consortium
    2.30 -
    2.31 -Permission is hereby granted, free of charge, to any person obtaining a
    2.32 -copy of this software and associated documentation files (the "Software"),
    2.33 -to deal in the Software without restriction, including without limitation
    2.34 -the rights to use, copy, modify, merge, publish, distribute, sublicense,
    2.35 -and/or sell copies of the Software, and to permit persons to whom the
    2.36 -Software furnished to do so, subject to the following conditions:
    2.37 -
    2.38 -The above copyright notice and this permission notice shall be included in
    2.39 -all copies or substantial portions of the Software.
    2.40 -
    2.41 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.42 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.43 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
    2.44 -THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    2.45 -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
    2.46 -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    2.47 -SOFTWARE.
    2.48 -
    2.49 -Except as contained in this notice, the name of the X Consortium shall not
    2.50 -be used in advertising or otherwise to promote the sale, use or other
    2.51 -dealing in this Software without prior written authorization from the
    2.52 -X Consortium.
    2.53 -_____________________________
    2.54 -Xmos_r.h:
    2.55 -/*
    2.56 -Copyright (c) 1996 X Consortium
    2.57 -
    2.58 -Permission is hereby granted, free of charge, to any person obtaining a copy
    2.59 -of this software and associated documentation files (the "Software"), to deal
    2.60 -in the Software without restriction, including without limitation the rights
    2.61 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    2.62 -copies of the Software, and to permit persons to whom the Software is
    2.63 -furnished to do so, subject to the following conditions:
    2.64 -
    2.65 -The above copyright notice and this permission notice shall be included in
    2.66 -all copies or substantial portions of the Software.
    2.67 -
    2.68 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.69 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.70 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    2.71 -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
    2.72 -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    2.73 -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2.74 -
    2.75 -Except as contained in this notice, the name of the X Consortium shall not be
    2.76 -used in advertising or otherwise to promote the sale, use or other dealings
    2.77 -in this Software without prior written authorization from the X Consortium.
    2.78 -*/
    2.79 -
    2.80 +
    2.81 +--- end of LICENSE ---
    2.82  _____________________________
    2.83  Copyright notice for HPkeysym.h:
    2.84  /*
    2.85 @@ -2906,55 +2853,6 @@
    2.86  performance, or use of this material.
    2.87  
    2.88  */
    2.89 -_____________________________________
    2.90 -Copyright notice in keysym2ucs.h:
    2.91 -
    2.92 -Copyright 1987, 1994, 1998 The Open Group
    2.93 -
    2.94 -Permission to use, copy, modify, distribute, and sell this software and its
    2.95 -documentation for any purpose is hereby granted without fee, provided that
    2.96 -the above copyright notice appear in all copies and that both that
    2.97 -copyright notice and this permission notice appear in supporting
    2.98 -documentation.
    2.99 -
   2.100 -The above copyright notice and this permission notice shall be included
   2.101 -in all copies or substantial portions of the Software.
   2.102 -
   2.103 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   2.104 -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   2.105 -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   2.106 -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
   2.107 -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
   2.108 -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   2.109 -OTHER DEALINGS IN THE SOFTWARE.
   2.110 -
   2.111 -Except as contained in this notice, the name of The Open Group shall
   2.112 -not be used in advertising or otherwise to promote the sale, use or
   2.113 -other dealings in this Software without prior written authorization
   2.114 -from The Open Group.
   2.115 -
   2.116 -
   2.117 -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
   2.118 -
   2.119 -All Rights Reserved
   2.120 -
   2.121 -Permission to use, copy, modify, and distribute this software and its
   2.122 -documentation for any purpose and without fee is hereby granted,
   2.123 -provided that the above copyright notice appear in all copies and that
   2.124 -both that copyright notice and this permission notice appear in
   2.125 -supporting documentation, and that the name of Digital not be
   2.126 -used in advertising or publicity pertaining to distribution of the
   2.127 -software without specific, written prior permission.
   2.128 -
   2.129 -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
   2.130 -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
   2.131 -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
   2.132 -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
   2.133 -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
   2.134 -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
   2.135 -SOFTWARE.
   2.136 -
   2.137 -*/
   2.138  
   2.139  --- end of LICENSE ---
   2.140  
   2.141 @@ -3000,7 +2898,7 @@
   2.142    Apache Jakarta BCEL 5.1 
   2.143    Apache Jakarta Regexp 1.4 
   2.144    Apache Santuario XML Security for Java 1.5.4
   2.145 -  Apache Xalan-Java 2.7.1 
   2.146 +  Apache Xalan-Java 2.7.2
   2.147    Apache Xerces Java 2.10.0 
   2.148    Apache XML Resolver 1.1 
   2.149  

mercurial