Mercurial > hg > release > icedtea6-1.11
changeset 2890:f25e5db93976 icedtea6-1.11.10
Merge
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 17 Apr 2013 11:49:33 +0100 |
| parents | 1609660fb832 (current diff) 0a85944d1c12 (diff) |
| children | 941b287668e4 |
| files | ChangeLog Makefile.am patches/coverage-table.patch |
| diffstat | 3 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 17 11:44:19 2013 +0100 +++ b/ChangeLog Wed Apr 17 11:49:33 2013 +0100 @@ -1,3 +1,9 @@ +2013-04-16 Omair Majid <omajid@redhat.com> + + * patches/coverage-table.patch: Remove. Already included + in patches/openjdk/6886358-layout_update.patch. + * Makefile.am (ICEDTEA_PATCHES): Remove patch. + 2013-04-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch,
--- a/Makefile.am Wed Apr 17 11:44:19 2013 +0100 +++ b/Makefile.am Wed Apr 17 11:49:33 2013 +0100 @@ -521,7 +521,6 @@ patches/openjdk/remove-mimpure-option-to-gcc.patch \ patches/idresolver_fix.patch \ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \ - patches/coverage-table.patch \ patches/openjdk/7185678-xmenuitem_peer_npe.patch \ patches/merge_fix.patch \ patches/openjdk/7175845-jar_uf_changes_file_permissions.patch \
--- a/patches/coverage-table.patch Wed Apr 17 11:44:19 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- openjdk/jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2012-05-01 23:18:32.000000000 +0200 -+++ openjdk.orig/jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2012-05-30 13:05:52.000000000 +0200 -@@ -71,6 +71,10 @@ - le_uint16 probe = power; - le_uint16 index = 0; - -+ if (count == 0) { -+ return -1; -+ } -+ - if (SWAPW(glyphArray[extra]) <= ttGlyphID) { - index = extra; - }