Merge

Fri, 14 Mar 2014 16:11:38 -0700

author
asaha
date
Fri, 14 Mar 2014 16:11:38 -0700
changeset 1020
893ac3b1d869
parent 955
ae6a3aec6aa2
parent 1019
d81e301cae70
child 1021
9f6447920be5

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Mar 12 14:10:13 2014 -0700
     1.2 +++ b/.hgtags	Fri Mar 14 16:11:38 2014 -0700
     1.3 @@ -253,6 +253,21 @@
     1.4  2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
     1.5  101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128
     1.6  1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129
     1.7 +839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
     1.8 +0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
     1.9 +2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
    1.10 +c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
    1.11 +6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
    1.12 +794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
    1.13 +c200d6cb184056e44afe7102913004b717896aa3 jdk8u5-b04
    1.14 +eb537d7c31e069ac10de0901727515743f7535d2 jdk8u5-b05
    1.15 +75cdae18810a479cc3c0fe8eb9055d968ae31c63 jdk8u5-b06
    1.16 +b1585984f29320737ca0da5af029b1225a75c476 jdk8u5-b07
    1.17 +a445d4130af79027fd9d6675b1ad7a8990225749 jdk8u5-b08
    1.18 +e5403ff707fbd828e56bf390931f236028f9617b jdk8u5-b09
    1.19 +fae51c73a06d71304c9dbff22984ee501812b972 jdk8u5-b10
    1.20 +dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11
    1.21 +3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12
    1.22  cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02
    1.23  6a3d3b7feab4d4a8252c63b4ce7d0fab106cf2f7 jdk8u20-b03
    1.24  7e1b01df280fb065c5953c48f54ac9d619ecbf1c jdk8u20-b04
     2.1 --- a/THIRD_PARTY_README	Wed Mar 12 14:10:13 2014 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Mar 14 16:11:38 2014 -0700
     2.3 @@ -1399,13 +1399,13 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to Little CMS 2.4, which may be 
     2.8 +%% This notice is provided with respect to Little CMS 2.5, which may be 
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13  Little CMS
    2.14 -Copyright (c) 1998-2010 Marti Maria Saguer
    2.15 +Copyright (c) 1998-2011 Marti Maria Saguer
    2.16  
    2.17  Permission is hereby granted, free of charge, to any person obtaining a copy
    2.18  of this software and associated documentation files (the "Software"), to deal
     3.1 --- a/common/autoconf/generated-configure.sh	Wed Mar 12 14:10:13 2014 -0700
     3.2 +++ b/common/autoconf/generated-configure.sh	Fri Mar 14 16:11:38 2014 -0700
     3.3 @@ -3865,7 +3865,7 @@
     3.4  #CUSTOM_AUTOCONF_INCLUDE
     3.5  
     3.6  # Do not change or remove the following line, it is needed for consistency checks:
     3.7 -DATE_WHEN_GENERATED=1389186094
     3.8 +DATE_WHEN_GENERATED=1390334534
     3.9  
    3.10  ###############################################################################
    3.11  #
    3.12 @@ -11156,6 +11156,12 @@
    3.13      as_fn_error $? "Update version must have a value" "$LINENO" 5
    3.14    elif test "x$with_update_version" != x; then
    3.15      JDK_UPDATE_VERSION="$with_update_version"
    3.16 +    # On macosx 10.7, it's not possible to set --with-update-version=0X due
    3.17 +    # to a bug in expr (which reduces it to just X). To work around this, we
    3.18 +    # always add a 0 to one digit update versions.
    3.19 +    if test "${#JDK_UPDATE_VERSION}" = "1"; then
    3.20 +      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
    3.21 +    fi
    3.22    fi
    3.23  
    3.24  
     4.1 --- a/common/autoconf/jdk-options.m4	Wed Mar 12 14:10:13 2014 -0700
     4.2 +++ b/common/autoconf/jdk-options.m4	Fri Mar 14 16:11:38 2014 -0700
     4.3 @@ -423,6 +423,12 @@
     4.4      AC_MSG_ERROR([Update version must have a value])
     4.5    elif test "x$with_update_version" != x; then
     4.6      JDK_UPDATE_VERSION="$with_update_version"
     4.7 +    # On macosx 10.7, it's not possible to set --with-update-version=0X due
     4.8 +    # to a bug in expr (which reduces it to just X). To work around this, we
     4.9 +    # always add a 0 to one digit update versions.
    4.10 +    if test "${#JDK_UPDATE_VERSION}" = "1"; then
    4.11 +      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
    4.12 +    fi
    4.13    fi
    4.14  
    4.15    AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],

mercurial