diff -Nru icu-4.8.1.1/debian/changelog icu-4.8.1.1/debian/changelog --- icu-4.8.1.1/debian/changelog 2015-03-06 17:01:23.000000000 +0000 +++ icu-4.8.1.1/debian/changelog 2015-03-09 17:44:38.000000000 +0000 @@ -1,3 +1,18 @@ +icu (4.8.1.1-3ubuntu0.5) precise-security; urgency=medium + + * SECURITY UPDATE: multiple issues via font file parsing (LP: #1429043) + - debian/patches/layoutengine-security.patch: updated to fix ABI break + and re-enabled. + - debian/patches/CVE-2014-65xx.patch: re-enabled. + - CVE-2013-1569 + - CVE-2013-2383 + - CVE-2013-2384 + - CVE-2013-2419 + - CVE-2014-6585 + - CVE-2014-6591 + + -- Marc Deslauriers Mon, 09 Mar 2015 13:43:14 -0400 + icu (4.8.1.1-3ubuntu0.4) precise-security; urgency=medium * SECURITY REGRESSION: libreoffice calc crash (LP: #1429043) diff -Nru icu-4.8.1.1/debian/patches/layoutengine-security.patch icu-4.8.1.1/debian/patches/layoutengine-security.patch --- icu-4.8.1.1/debian/patches/layoutengine-security.patch 2015-02-27 21:39:40.000000000 +0000 +++ icu-4.8.1.1/debian/patches/layoutengine-security.patch 2015-03-09 16:30:32.000000000 +0000 @@ -5,10 +5,12 @@ Bug: http://bugs.icu-project.org/trac/ticket/10107 Bug: http://bugs.icu-project.org/trac/ticket/10143 +Updated 2015-03-09 to fix ABI compatibility with LibreOffice + Index: icu-4.8.1.1/source/layout/AlternateSubstSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/AlternateSubstSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/AlternateSubstSubtables.cpp 2015-02-27 15:30:42.753472434 -0500 +--- icu-4.8.1.1.orig/source/layout/AlternateSubstSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/AlternateSubstSubtables.cpp 2015-03-09 12:29:52.138000298 -0400 @@ -1,6 +1,6 @@ /* * @@ -52,8 +54,8 @@ Index: icu-4.8.1.1/source/layout/AlternateSubstSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/AlternateSubstSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/AlternateSubstSubtables.h 2015-02-27 15:30:42.753472434 -0500 +--- icu-4.8.1.1.orig/source/layout/AlternateSubstSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/AlternateSubstSubtables.h 2015-03-09 12:29:52.138000298 -0400 @@ -1,6 +1,6 @@ /* * @@ -83,8 +85,8 @@ #endif Index: icu-4.8.1.1/source/layout/ArabicLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ArabicLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ArabicLayoutEngine.cpp 2015-02-27 15:30:42.753472434 -0500 +--- icu-4.8.1.1.orig/source/layout/ArabicLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ArabicLayoutEngine.cpp 2015-03-09 12:29:52.138000298 -0400 @@ -1,7 +1,7 @@ /* @@ -180,8 +182,8 @@ } Index: icu-4.8.1.1/source/layout/ArabicLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ArabicLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ArabicLayoutEngine.h 2015-02-27 15:30:42.757472465 -0500 +--- icu-4.8.1.1.orig/source/layout/ArabicLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ArabicLayoutEngine.h 2015-03-09 12:29:52.138000298 -0400 @@ -1,7 +1,7 @@ /* @@ -202,8 +204,8 @@ * This constructor is used when the font requires a "canned" GSUB table which can't be known Index: icu-4.8.1.1/source/layout/ArabicShaping.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ArabicShaping.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ArabicShaping.cpp 2015-02-27 15:30:42.757472465 -0500 +--- icu-4.8.1.1.orig/source/layout/ArabicShaping.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ArabicShaping.cpp 2015-03-09 12:29:52.138000298 -0400 @@ -1,6 +1,6 @@ /* * @@ -274,8 +276,8 @@ } Index: icu-4.8.1.1/source/layout/ArabicShaping.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ArabicShaping.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ArabicShaping.h 2015-02-27 15:30:42.757472465 -0500 +--- icu-4.8.1.1.orig/source/layout/ArabicShaping.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ArabicShaping.h 2015-03-09 12:29:52.138000298 -0400 @@ -1,6 +1,6 @@ /* * @@ -299,8 +301,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/AttachmentPosnSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/AttachmentPosnSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/AttachmentPosnSubtables.h 2015-02-27 15:30:42.757472465 -0500 +--- icu-4.8.1.1.orig/source/layout/AttachmentPosnSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/AttachmentPosnSubtables.h 2015-03-09 12:29:52.138000298 -0400 @@ -1,6 +1,6 @@ /* * @@ -329,8 +331,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/CanonData.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/CanonData.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CanonData.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CanonData.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CanonData.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -7548,8 +7550,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/CanonShaping.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/CanonShaping.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CanonShaping.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CanonShaping.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CanonShaping.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -7589,8 +7591,8 @@ LE_DELETE_ARRAY(indices); Index: icu-4.8.1.1/source/layout/CanonShaping.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/CanonShaping.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CanonShaping.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CanonShaping.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CanonShaping.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -7611,8 +7613,8 @@ LEUnicode *outChars, LEGlyphStorage &glyphStorage); Index: icu-4.8.1.1/source/layout/ClassDefinitionTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ClassDefinitionTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ClassDefinitionTables.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ClassDefinitionTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ClassDefinitionTables.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -7771,8 +7773,8 @@ } Index: icu-4.8.1.1/source/layout/ClassDefinitionTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ClassDefinitionTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ClassDefinitionTables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ClassDefinitionTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ClassDefinitionTables.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -7833,8 +7835,8 @@ #endif Index: icu-4.8.1.1/source/layout/ContextualGlyphInsertion.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualGlyphInsertion.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualGlyphInsertion.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualGlyphInsertion.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualGlyphInsertion.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ -/* +/** @@ -7878,7 +7880,7 @@ Index: icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.cpp 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -0,0 +1,114 @@ +/* + * @@ -7997,7 +7999,7 @@ Index: icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.h 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/ContextualGlyphInsertionProc2.h 2015-03-09 12:29:52.146000368 -0400 @@ -0,0 +1,81 @@ +/* + * @@ -8082,8 +8084,8 @@ +#endif Index: icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstProc.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstProc.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8166,8 +8168,8 @@ markGlyph = currGlyph; Index: icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstProc.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstProc.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8203,7 +8205,7 @@ Index: icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.cpp 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -0,0 +1,145 @@ +/* + * @@ -8353,7 +8355,7 @@ Index: icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.h 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/ContextualGlyphSubstProc2.h 2015-03-09 12:29:52.146000368 -0400 @@ -0,0 +1,67 @@ +/* + * @@ -8424,8 +8426,8 @@ +#endif Index: icu-4.8.1.1/source/layout/ContextualGlyphSubstitution.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstitution.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualGlyphSubstitution.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualGlyphSubstitution.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualGlyphSubstitution.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8460,8 +8462,8 @@ #endif Index: icu-4.8.1.1/source/layout/ContextualSubstSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualSubstSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualSubstSubtables.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualSubstSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualSubstSubtables.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved @@ -8507,8 +8509,8 @@ const ClassDefinitionTable *backtrackClassDefinitionTable = Index: icu-4.8.1.1/source/layout/ContextualSubstSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ContextualSubstSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ContextualSubstSubtables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ContextualSubstSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ContextualSubstSubtables.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8644,8 +8646,8 @@ #endif Index: icu-4.8.1.1/source/layout/CoverageTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/CoverageTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CoverageTables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CoverageTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CoverageTables.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8673,8 +8675,8 @@ #endif Index: icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/CursiveAttachmentSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CursiveAttachmentSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998 - 2007 - All Rights Reserved @@ -8697,8 +8699,8 @@ if (coverageIndex < 0 || coverageIndex >= eeCount) { Index: icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/CursiveAttachmentSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/CursiveAttachmentSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/CursiveAttachmentSubtables.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8720,8 +8722,8 @@ #endif Index: icu-4.8.1.1/source/layout/DeviceTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/DeviceTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/DeviceTables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/DeviceTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/DeviceTables.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,7 +1,7 @@ /* * @(#)DeviceTables.h 1.5 00/03/15 @@ -8741,8 +8743,8 @@ #endif Index: icu-4.8.1.1/source/layout/ExtensionSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ExtensionSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ExtensionSubtables.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/ExtensionSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ExtensionSubtables.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,7 +1,7 @@ /* * %W% %E% @@ -8790,8 +8792,8 @@ return 0; Index: icu-4.8.1.1/source/layout/Features.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/Features.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/Features.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/Features.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/Features.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,7 +1,7 @@ /* * @(#)Features.cpp 1.4 00/03/15 @@ -8836,8 +8838,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/GDEFMarkFilter.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GDEFMarkFilter.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GDEFMarkFilter.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GDEFMarkFilter.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GDEFMarkFilter.cpp 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8863,8 +8865,8 @@ GDEFMarkFilter::~GDEFMarkFilter() Index: icu-4.8.1.1/source/layout/GDEFMarkFilter.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GDEFMarkFilter.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GDEFMarkFilter.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GDEFMarkFilter.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GDEFMarkFilter.h 2015-03-09 12:29:52.146000368 -0400 @@ -1,6 +1,6 @@ /* * @@ -8891,8 +8893,8 @@ virtual le_bool accept(LEGlyphID glyph) const; Index: icu-4.8.1.1/source/layout/GXLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GXLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GXLayoutEngine.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GXLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GXLayoutEngine.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* @@ -8925,8 +8927,8 @@ } Index: icu-4.8.1.1/source/layout/GXLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GXLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GXLayoutEngine.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GXLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GXLayoutEngine.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* @@ -8957,7 +8959,7 @@ Index: icu-4.8.1.1/source/layout/GXLayoutEngine2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/GXLayoutEngine2.cpp 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/GXLayoutEngine2.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -0,0 +1,66 @@ +/* + * @@ -9028,7 +9030,7 @@ Index: icu-4.8.1.1/source/layout/GXLayoutEngine2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/GXLayoutEngine2.h 2015-02-27 15:30:42.765472531 -0500 ++++ icu-4.8.1.1/source/layout/GXLayoutEngine2.h 2015-03-09 12:29:52.150000403 -0400 @@ -0,0 +1,125 @@ +/* + * @@ -9157,8 +9159,8 @@ + Index: icu-4.8.1.1/source/layout/GlyphDefinitionTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphDefinitionTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphDefinitionTables.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphDefinitionTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphDefinitionTables.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9214,8 +9216,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/GlyphDefinitionTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphDefinitionTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphDefinitionTables.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphDefinitionTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphDefinitionTables.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9279,8 +9281,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/GlyphIterator.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphIterator.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphIterator.cpp 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphIterator.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphIterator.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9381,8 +9383,8 @@ Index: icu-4.8.1.1/source/layout/GlyphIterator.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphIterator.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphIterator.h 2015-02-27 15:30:42.765472531 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphIterator.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphIterator.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9413,8 +9415,8 @@ }; Index: icu-4.8.1.1/source/layout/GlyphLookupTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphLookupTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphLookupTables.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphLookupTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphLookupTables.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9455,8 +9457,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/GlyphLookupTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphLookupTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphLookupTables.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphLookupTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphLookupTables.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9478,8 +9480,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/GlyphPositioningTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphPositioningTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphPositioningTables.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphPositioningTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphPositioningTables.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved @@ -9509,8 +9511,8 @@ } Index: icu-4.8.1.1/source/layout/GlyphPositioningTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphPositioningTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphPositioningTables.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphPositioningTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphPositioningTables.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved @@ -9540,8 +9542,8 @@ Index: icu-4.8.1.1/source/layout/GlyphPosnLookupProc.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphPosnLookupProc.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphPosnLookupProc.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphPosnLookupProc.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphPosnLookupProc.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998 - 2010 - All Rights Reserved @@ -9665,8 +9667,8 @@ break; Index: icu-4.8.1.1/source/layout/GlyphPosnLookupProc.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphPosnLookupProc.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphPosnLookupProc.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphPosnLookupProc.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphPosnLookupProc.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2010 - All Rights Reserved @@ -9694,8 +9696,8 @@ protected: Index: icu-4.8.1.1/source/layout/GlyphSubstLookupProc.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphSubstLookupProc.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphSubstLookupProc.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphSubstLookupProc.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphSubstLookupProc.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9800,8 +9802,8 @@ break; Index: icu-4.8.1.1/source/layout/GlyphSubstLookupProc.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphSubstLookupProc.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphSubstLookupProc.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphSubstLookupProc.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphSubstLookupProc.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2010 - All Rights Reserved @@ -9829,8 +9831,8 @@ protected: Index: icu-4.8.1.1/source/layout/GlyphSubstitutionTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphSubstitutionTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphSubstitutionTables.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphSubstitutionTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphSubstitutionTables.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9865,8 +9867,8 @@ Index: icu-4.8.1.1/source/layout/GlyphSubstitutionTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/GlyphSubstitutionTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/GlyphSubstitutionTables.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/GlyphSubstitutionTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/GlyphSubstitutionTables.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -9892,8 +9894,8 @@ le_int32 featureMapCount, Index: icu-4.8.1.1/source/layout/HanLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/HanLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/HanLayoutEngine.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/HanLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/HanLayoutEngine.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* * HanLayoutEngine.cpp: OpenType processing for Han fonts. @@ -9914,8 +9916,8 @@ fFeatureMap = featureMap; Index: icu-4.8.1.1/source/layout/HanLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/HanLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/HanLayoutEngine.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/HanLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/HanLayoutEngine.h 2015-03-09 12:29:52.150000403 -0400 @@ -2,7 +2,7 @@ /* * HanLayoutEngine.h: OpenType processing for Han fonts. @@ -9936,8 +9938,8 @@ /** Index: icu-4.8.1.1/source/layout/HangulLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/HangulLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/HangulLayoutEngine.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/HangulLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/HangulLayoutEngine.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* * HangulLayoutEngine.cpp: OpenType processing for Han fonts. @@ -9958,8 +9960,8 @@ fFeatureMap = featureMap; Index: icu-4.8.1.1/source/layout/HangulLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/HangulLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/HangulLayoutEngine.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/HangulLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/HangulLayoutEngine.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* @@ -9980,8 +9982,8 @@ * This constructor is used when the font requires a "canned" GSUB table which can't be known Index: icu-4.8.1.1/source/layout/ICUFeatures.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ICUFeatures.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ICUFeatures.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/ICUFeatures.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ICUFeatures.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -10016,8 +10018,8 @@ #endif Index: icu-4.8.1.1/source/layout/IndicLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicLayoutEngine.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicLayoutEngine.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* @@ -10038,8 +10040,8 @@ if ( version2 ) { Index: icu-4.8.1.1/source/layout/IndicLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicLayoutEngine.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicLayoutEngine.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,7 +1,7 @@ /* @@ -10060,8 +10062,8 @@ * This constructor is used when the font requires a "canned" GSUB table which can't be known Index: icu-4.8.1.1/source/layout/IndicRearrangement.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicRearrangement.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicRearrangement.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicRearrangement.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicRearrangement.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -10094,8 +10096,8 @@ Index: icu-4.8.1.1/source/layout/IndicRearrangementProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicRearrangementProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicRearrangementProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -10135,8 +10137,8 @@ Index: icu-4.8.1.1/source/layout/IndicRearrangementProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicRearrangementProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicRearrangementProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor.h 2015-03-09 12:29:52.150000403 -0400 @@ -1,6 +1,6 @@ /* * @@ -10169,7 +10171,7 @@ Index: icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.cpp 2015-02-27 15:30:42.769472563 -0500 ++++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.cpp 2015-03-09 12:29:52.150000403 -0400 @@ -0,0 +1,400 @@ +/* + * @@ -10574,7 +10576,7 @@ Index: icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.h 2015-02-27 15:30:42.769472563 -0500 ++++ icu-4.8.1.1/source/layout/IndicRearrangementProcessor2.h 2015-03-09 12:29:52.150000403 -0400 @@ -0,0 +1,63 @@ +/* + * @@ -10641,8 +10643,8 @@ +#endif Index: icu-4.8.1.1/source/layout/IndicReordering.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicReordering.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicReordering.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicReordering.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicReordering.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* / * @@ -10862,8 +10864,8 @@ if ( classTable->isConsonant(currentChar)) { Index: icu-4.8.1.1/source/layout/IndicReordering.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/IndicReordering.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/IndicReordering.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/IndicReordering.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/IndicReordering.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -10885,8 +10887,8 @@ class LEGlyphStorage; Index: icu-4.8.1.1/source/layout/KernTable.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/KernTable.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/KernTable.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/KernTable.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/KernTable.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,7 +1,7 @@ /* * @(#)KernTable.cpp 1.1 04/10/13 @@ -11098,8 +11100,8 @@ Index: icu-4.8.1.1/source/layout/KernTable.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/KernTable.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/KernTable.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/KernTable.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/KernTable.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,7 +1,7 @@ /* * @(#)KernTable.h 1.1 04/10/13 @@ -11143,8 +11145,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/KhmerLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/KhmerLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/KhmerLayoutEngine.cpp 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/KhmerLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/KhmerLayoutEngine.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* @@ -11164,8 +11166,8 @@ fFeatureMap = KhmerReordering::getFeatureMap(fFeatureMapCount); Index: icu-4.8.1.1/source/layout/KhmerLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/KhmerLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/KhmerLayoutEngine.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/KhmerLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/KhmerLayoutEngine.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,7 +1,7 @@ /* @@ -11186,8 +11188,8 @@ * This constructor is used when the font requires a "canned" GSUB table which can't be known Index: icu-4.8.1.1/source/layout/LEFontInstance.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LEFontInstance.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LEFontInstance.h 2015-02-27 15:54:37.785192362 -0500 +--- icu-4.8.1.1.orig/source/layout/LEFontInstance.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LEFontInstance.h 2015-03-09 12:30:24.546286223 -0400 @@ -1,7 +1,7 @@ /* @@ -11208,7 +11210,7 @@ * @param tableTag - the four byte table tag. (e.g. 'cmap') * * @return the address of the table in memory, or NULL -@@ -166,6 +170,27 @@ +@@ -166,6 +170,29 @@ virtual const void *getFontTable(LETag tableTag) const = 0; /** @@ -11230,7 +11232,9 @@ + * if the table doesn't exist. + * @internal + */ -+ virtual const void* getFontTable(LETag tableTag, size_t &length) const { length=-1; return getFontTable(tableTag); } /* -1 = unknown length */ ++ ++ /* Changed for ABI compatibility reasons */ ++ const void* getFontTable(LETag tableTag, size_t &length) const { length=-1; return getFontTable(tableTag); } + + /** * This method is used to determine if the font can @@ -11238,8 +11242,8 @@ * by looking the character up in the font's character Index: icu-4.8.1.1/source/layout/LEGlyphFilter.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LEGlyphFilter.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LEGlyphFilter.h 2015-02-27 15:30:42.769472563 -0500 +--- icu-4.8.1.1.orig/source/layout/LEGlyphFilter.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LEGlyphFilter.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -11266,8 +11270,8 @@ #endif Index: icu-4.8.1.1/source/layout/LEInsertionList.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LEInsertionList.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LEInsertionList.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LEInsertionList.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LEInsertionList.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* ********************************************************************** @@ -11294,8 +11298,8 @@ #endif Index: icu-4.8.1.1/source/layout/LEScripts.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LEScripts.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LEScripts.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LEScripts.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LEScripts.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,11 +1,11 @@ /* * @@ -11342,7 +11346,7 @@ Index: icu-4.8.1.1/source/layout/LETableReference.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/LETableReference.h 2015-02-27 15:30:42.773472596 -0500 ++++ icu-4.8.1.1/source/layout/LETableReference.h 2015-03-09 12:29:52.154000438 -0400 @@ -0,0 +1,418 @@ +/* + * -*- c++ -*- @@ -11362,7 +11366,7 @@ + +#define kQuestionmarkTableTag 0x3F3F3F3FUL +#define kTildeTableTag 0x7e7e7e7eUL -+#ifdef __cplusplus ++#ifdef XP_CPLUSPLUS + +// internal - interface for range checking +U_NAMESPACE_BEGIN @@ -11764,8 +11768,8 @@ +#endif Index: icu-4.8.1.1/source/layout/LETypes.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LETypes.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LETypes.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LETypes.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LETypes.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -11774,15 +11778,6 @@ * */ -@@ -13,7 +13,7 @@ - - #include "unicode/utypes.h" - --#ifdef XP_CPLUSPLUS -+#ifdef __cplusplus - #include "unicode/uobject.h" - #endif - @@ -229,12 +229,14 @@ */ typedef UChar32 LEUnicode32; @@ -11798,15 +11793,6 @@ /** * Used to hold a pair of (x, y) values which represent a point. -@@ -258,7 +260,7 @@ - float fY; - }; - --#ifndef XP_CPLUSPLUS -+#ifndef __cplusplus - /** - * Used to hold a pair of (x, y) values which represent a point. - * @@ -268,6 +270,39 @@ #endif @@ -12004,15 +11990,6 @@ * Error codes returned by the LayoutEngine. * * @stable ICU 2.4 -@@ -542,7 +692,7 @@ - LE_MISSING_FONT_TABLE_ERROR = U_MISSING_RESOURCE_ERROR /**< The requested font table does not exist. */ - }; - --#ifndef XP_CPLUSPLUS -+#ifndef __cplusplus - /** - * Error codes returned by the LayoutEngine. - * @@ -565,4 +715,5 @@ */ #define LE_FAILURE(code) (U_FAILURE((UErrorCode)code)) @@ -12021,8 +11998,8 @@ #endif Index: icu-4.8.1.1/source/layout/LayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/LayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LayoutEngine.cpp 2015-02-27 15:54:52.829317341 -0500 +--- icu-4.8.1.1.orig/source/layout/LayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LayoutEngine.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,10 +1,11 @@ /* - * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved @@ -12238,19 +12215,21 @@ glyphStorage.getGlyphPosition(p + 1, next, ignore, success); xAdvance = next - prev; -@@ -456,9 +461,9 @@ - glyphStorage.adjustPosition(glyphCount, xAdjust, 0, success); +@@ -461,6 +466,13 @@ + return fFontInstance->getFontTable(tableTag); } --const void *LayoutEngine::getFontTable(LETag tableTag) const ++/* Disabled to preserve ABI compatibility +const void *LayoutEngine::getFontTable(LETag tableTag, size_t &length) const - { -- return fFontInstance->getFontTable(tableTag); ++{ + return fFontInstance->getFontTable(tableTag, length); - } - ++} ++*/ ++ void LayoutEngine::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, le_bool mirror, -@@ -495,7 +500,7 @@ + LEGlyphStorage &glyphStorage, LEErrorCode &success) + { +@@ -495,7 +507,7 @@ if (fGlyphStorage->getGlyphCount() > 0) { fGlyphStorage->reset(); } @@ -12259,7 +12238,7 @@ glyphCount = computeGlyphs(chars, offset, count, max, rightToLeft, *fGlyphStorage, success); positionGlyphs(*fGlyphStorage, x, y, success); adjustGlyphPositions(chars, offset, count, rightToLeft, *fGlyphStorage, success); -@@ -505,37 +510,40 @@ +@@ -505,37 +517,40 @@ void LayoutEngine::reset() { @@ -12310,7 +12289,7 @@ switch (scriptCode) { case bengScriptCode: case devaScriptCode: -@@ -571,10 +579,10 @@ +@@ -571,10 +586,10 @@ case janLanguageCode: case zhtLanguageCode: case zhsLanguageCode: @@ -12323,7 +12302,7 @@ // note: falling through to default case. default: -@@ -597,46 +605,50 @@ +@@ -597,46 +612,50 @@ break; } } else { @@ -12415,8 +12394,8 @@ } Index: icu-4.8.1.1/source/layout/LayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LayoutEngine.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LayoutEngine.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved @@ -12459,27 +12438,7 @@ /** * This overrides the default no argument constructor to make it * difficult for clients to call it. Clients are expected to call -@@ -246,12 +252,18 @@ - * some other way must override this method. - * - * @param tableTag - the four byte table tag. -+ * @param length - length to use - * - * @return the address of the table. - * - * @internal - */ -- virtual const void *getFontTable(LETag tableTag) const; -+ virtual const void *getFontTable(LETag tableTag, size_t &length) const; -+ -+ /** -+ * @deprecated -+ */ -+ virtual const void *getFontTable(LETag tableTag) const { size_t ignored; return getFontTable(tableTag, ignored); } - - /** - * This method does character to glyph mapping. The default implementation -@@ -280,6 +292,7 @@ +@@ -280,6 +286,7 @@ */ virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, le_bool mirror, LEGlyphStorage &glyphStorage, LEErrorCode &success); @@ -12487,7 +12446,7 @@ /** * This is a convenience method that forces the advance width of mark * glyphs to be zero, which is required for proper selection and highlighting. -@@ -314,7 +327,7 @@ +@@ -314,7 +321,7 @@ * @internal */ static void adjustMarkGlyphs(const LEUnicode chars[], le_int32 charCount, le_bool reverse, LEGlyphStorage &glyphStorage, LEGlyphFilter *markFilter, LEErrorCode &success); @@ -12498,8 +12457,8 @@ /** Index: icu-4.8.1.1/source/layout/LigatureSubstProc.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/LigatureSubstProc.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LigatureSubstProc.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LigatureSubstProc.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LigatureSubstProc.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -12632,8 +12591,8 @@ Index: icu-4.8.1.1/source/layout/LigatureSubstProc.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LigatureSubstProc.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LigatureSubstProc.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LigatureSubstProc.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LigatureSubstProc.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -12669,7 +12628,7 @@ Index: icu-4.8.1.1/source/layout/LigatureSubstProc2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/LigatureSubstProc2.cpp 2015-02-27 15:30:42.773472596 -0500 ++++ icu-4.8.1.1/source/layout/LigatureSubstProc2.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -0,0 +1,145 @@ +/* + * @@ -12819,7 +12778,7 @@ Index: icu-4.8.1.1/source/layout/LigatureSubstProc2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/LigatureSubstProc2.h 2015-02-27 15:30:42.773472596 -0500 ++++ icu-4.8.1.1/source/layout/LigatureSubstProc2.h 2015-03-09 12:29:52.154000438 -0400 @@ -0,0 +1,72 @@ +/* + * @@ -12895,8 +12854,8 @@ +#endif Index: icu-4.8.1.1/source/layout/LigatureSubstSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/LigatureSubstSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LigatureSubstSubtables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LigatureSubstSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LigatureSubstSubtables.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2006 - All Rights Reserved @@ -12919,8 +12878,8 @@ Offset ligSetTableOffset = SWAPW(ligSetTableOffsetArray[coverageIndex]); Index: icu-4.8.1.1/source/layout/LigatureSubstSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LigatureSubstSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LigatureSubstSubtables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LigatureSubstSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LigatureSubstSubtables.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -12957,8 +12916,8 @@ #endif Index: icu-4.8.1.1/source/layout/LigatureSubstitution.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LigatureSubstitution.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LigatureSubstitution.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LigatureSubstitution.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LigatureSubstitution.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -13003,8 +12962,8 @@ enum LigatureActionFlags Index: icu-4.8.1.1/source/layout/LookupProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/LookupProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LookupProcessor.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LookupProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LookupProcessor.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -13275,8 +13234,8 @@ } Index: icu-4.8.1.1/source/layout/LookupProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LookupProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LookupProcessor.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LookupProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LookupProcessor.h 2015-03-09 12:29:52.154000438 -0400 @@ -1,7 +1,7 @@ /* * %W% %E% @@ -13345,8 +13304,8 @@ LookupProcessor(const LookupProcessor &other); // forbid copying of this class Index: icu-4.8.1.1/source/layout/LookupTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/LookupTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LookupTables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LookupTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LookupTables.cpp 2015-03-09 12:29:52.154000438 -0400 @@ -1,6 +1,6 @@ /* * @@ -13434,8 +13393,8 @@ return NULL; Index: icu-4.8.1.1/source/layout/LookupTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/LookupTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/LookupTables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/LookupTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/LookupTables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13499,8 +13458,8 @@ #endif Index: icu-4.8.1.1/source/layout/Lookups.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/Lookups.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/Lookups.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/Lookups.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/Lookups.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13564,8 +13523,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/Lookups.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/Lookups.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/Lookups.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/Lookups.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/Lookups.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13630,8 +13589,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/Makefile.in =================================================================== ---- icu-4.8.1.1.orig/source/layout/Makefile.in 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/Makefile.in 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/Makefile.in 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/Makefile.in 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ #****************************************************************************** # @@ -13710,8 +13669,8 @@ - Index: icu-4.8.1.1/source/layout/MarkArrays.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkArrays.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkArrays.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkArrays.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkArrays.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13730,8 +13689,8 @@ #endif Index: icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToBasePosnSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToBasePosnSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13764,8 +13723,8 @@ Index: icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToBasePosnSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToBasePosnSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToBasePosnSubtables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13800,8 +13759,8 @@ #endif Index: icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToLigaturePosnSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToLigaturePosnSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved @@ -13833,8 +13792,8 @@ Index: icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToLigaturePosnSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToLigaturePosnSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToLigaturePosnSubtables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13876,8 +13835,8 @@ #endif Index: icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToMarkPosnSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToMarkPosnSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13910,8 +13869,8 @@ Index: icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MarkToMarkPosnSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MarkToMarkPosnSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MarkToMarkPosnSubtables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13946,8 +13905,8 @@ #endif Index: icu-4.8.1.1/source/layout/MorphStateTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MorphStateTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MorphStateTables.h 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MorphStateTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MorphStateTables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -13969,8 +13928,8 @@ #endif Index: icu-4.8.1.1/source/layout/MorphTables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/MorphTables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MorphTables.cpp 2015-02-27 15:30:42.773472596 -0500 +--- icu-4.8.1.1.orig/source/layout/MorphTables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MorphTables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,7 +1,7 @@ /* * %W% %W% @@ -14074,8 +14033,8 @@ Index: icu-4.8.1.1/source/layout/MorphTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MorphTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MorphTables.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/MorphTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MorphTables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -14424,7 +14383,7 @@ Index: icu-4.8.1.1/source/layout/MorphTables2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/MorphTables2.cpp 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/MorphTables2.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -0,0 +1,223 @@ +/* + * (C) Copyright IBM Corp. and others 1998 - 2013 - All Rights Reserved @@ -14651,8 +14610,8 @@ +U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/MultipleSubstSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/MultipleSubstSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MultipleSubstSubtables.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/MultipleSubstSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MultipleSubstSubtables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -14681,8 +14640,8 @@ if (coverageIndex >= 0 && coverageIndex < seqCount) { Index: icu-4.8.1.1/source/layout/MultipleSubstSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/MultipleSubstSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/MultipleSubstSubtables.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/MultipleSubstSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/MultipleSubstSubtables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -14711,8 +14670,8 @@ #endif Index: icu-4.8.1.1/source/layout/NonContextualGlyphSubst.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubst.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/NonContextualGlyphSubst.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubst.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/NonContextualGlyphSubst.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,7 +1,5 @@ /* - * %W% %E% @@ -14736,8 +14695,8 @@ #endif Index: icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubstProc.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubstProc.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -14796,8 +14755,8 @@ return NULL; Index: icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubstProc.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/NonContextualGlyphSubstProc.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -14826,7 +14785,7 @@ Index: icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.cpp 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -0,0 +1,63 @@ +/* + * @@ -14894,7 +14853,7 @@ Index: icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.h 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/NonContextualGlyphSubstProc2.h 2015-03-09 12:29:52.158000474 -0400 @@ -0,0 +1,43 @@ +/* + * @@ -14941,8 +14900,8 @@ +#endif Index: icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/OpenTypeLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/OpenTypeLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,7 +1,7 @@ /* @@ -15278,8 +15237,8 @@ float xAdjust = 0, yAdjust = 0; Index: icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/OpenTypeLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/OpenTypeLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/OpenTypeLayoutEngine.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2009 - All Rights Reserved @@ -15345,8 +15304,8 @@ * preformed by the GSUB table. This is used for some Index: icu-4.8.1.1/source/layout/OpenTypeTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/OpenTypeTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/OpenTypeTables.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/OpenTypeTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/OpenTypeTables.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -15374,8 +15333,8 @@ { Index: icu-4.8.1.1/source/layout/OpenTypeUtilities.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/OpenTypeUtilities.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/OpenTypeUtilities.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/OpenTypeUtilities.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/OpenTypeUtilities.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -15532,8 +15491,8 @@ +#endif Index: icu-4.8.1.1/source/layout/OpenTypeUtilities.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/OpenTypeUtilities.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/OpenTypeUtilities.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/OpenTypeUtilities.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/OpenTypeUtilities.h 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -15561,8 +15520,8 @@ static void sort(le_uint16 *array, le_int32 count); Index: icu-4.8.1.1/source/layout/PairPositioningSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/PairPositioningSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/PairPositioningSubtables.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/PairPositioningSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/PairPositioningSubtables.cpp 2015-03-09 12:29:52.158000474 -0400 @@ -1,6 +1,6 @@ /* * @@ -15636,8 +15595,8 @@ if (coverageIndex >= 0 && glyphIterator->next()) { Index: icu-4.8.1.1/source/layout/PairPositioningSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/PairPositioningSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/PairPositioningSubtables.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/PairPositioningSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/PairPositioningSubtables.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -15698,8 +15657,8 @@ #endif Index: icu-4.8.1.1/source/layout/ScriptAndLanguage.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ScriptAndLanguage.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ScriptAndLanguage.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/ScriptAndLanguage.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ScriptAndLanguage.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved @@ -15823,8 +15782,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/ScriptAndLanguage.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ScriptAndLanguage.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ScriptAndLanguage.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/ScriptAndLanguage.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ScriptAndLanguage.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -15867,8 +15826,8 @@ #endif Index: icu-4.8.1.1/source/layout/ScriptAndLanguageTags.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ScriptAndLanguageTags.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ScriptAndLanguageTags.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/ScriptAndLanguageTags.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ScriptAndLanguageTags.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,11 +1,11 @@ /* * @@ -15936,8 +15895,8 @@ const LETag OpenTypeLayoutEngine::languageTags[] = { Index: icu-4.8.1.1/source/layout/ScriptAndLanguageTags.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ScriptAndLanguageTags.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ScriptAndLanguageTags.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/ScriptAndLanguageTags.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ScriptAndLanguageTags.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,11 +1,11 @@ /* * @@ -16004,8 +15963,8 @@ Index: icu-4.8.1.1/source/layout/SegmentArrayProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SegmentArrayProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SegmentArrayProcessor.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SegmentArrayProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SegmentArrayProcessor.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16063,8 +16022,8 @@ } Index: icu-4.8.1.1/source/layout/SegmentArrayProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SegmentArrayProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SegmentArrayProcessor.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SegmentArrayProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SegmentArrayProcessor.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16097,7 +16056,7 @@ Index: icu-4.8.1.1/source/layout/SegmentArrayProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SegmentArrayProcessor2.cpp 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SegmentArrayProcessor2.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,59 @@ +/* + * @@ -16161,7 +16120,7 @@ Index: icu-4.8.1.1/source/layout/SegmentArrayProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SegmentArrayProcessor2.h 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SegmentArrayProcessor2.h 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,58 @@ +/* + * @@ -16223,8 +16182,8 @@ + Index: icu-4.8.1.1/source/layout/SegmentSingleProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SegmentSingleProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SegmentSingleProcessor.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SegmentSingleProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SegmentSingleProcessor.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16273,8 +16232,8 @@ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph); Index: icu-4.8.1.1/source/layout/SegmentSingleProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SegmentSingleProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SegmentSingleProcessor.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SegmentSingleProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SegmentSingleProcessor.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16307,7 +16266,7 @@ Index: icu-4.8.1.1/source/layout/SegmentSingleProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SegmentSingleProcessor2.cpp 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SegmentSingleProcessor2.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,54 @@ +/* + * @@ -16366,7 +16325,7 @@ Index: icu-4.8.1.1/source/layout/SegmentSingleProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SegmentSingleProcessor2.h 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SegmentSingleProcessor2.h 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,58 @@ +/* + * @@ -16428,8 +16387,8 @@ + Index: icu-4.8.1.1/source/layout/ShapingTypeData.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ShapingTypeData.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ShapingTypeData.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/ShapingTypeData.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ShapingTypeData.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16447,8 +16406,8 @@ U_NAMESPACE_END Index: icu-4.8.1.1/source/layout/SimpleArrayProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SimpleArrayProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SimpleArrayProcessor.cpp 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SimpleArrayProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SimpleArrayProcessor.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16499,8 +16458,8 @@ } Index: icu-4.8.1.1/source/layout/SimpleArrayProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SimpleArrayProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SimpleArrayProcessor.h 2015-02-27 15:30:42.777472629 -0500 +--- icu-4.8.1.1.orig/source/layout/SimpleArrayProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SimpleArrayProcessor.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16533,7 +16492,7 @@ Index: icu-4.8.1.1/source/layout/SimpleArrayProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SimpleArrayProcessor2.cpp 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SimpleArrayProcessor2.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,53 @@ +/* + * @@ -16591,7 +16550,7 @@ Index: icu-4.8.1.1/source/layout/SimpleArrayProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SimpleArrayProcessor2.h 2015-02-27 15:30:42.777472629 -0500 ++++ icu-4.8.1.1/source/layout/SimpleArrayProcessor2.h 2015-03-09 12:29:52.162000509 -0400 @@ -0,0 +1,59 @@ +/* + * @@ -16654,8 +16613,8 @@ + Index: icu-4.8.1.1/source/layout/SinglePositioningSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SinglePositioningSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SinglePositioningSubtables.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SinglePositioningSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SinglePositioningSubtables.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16722,8 +16681,8 @@ valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance); Index: icu-4.8.1.1/source/layout/SinglePositioningSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SinglePositioningSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SinglePositioningSubtables.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SinglePositioningSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SinglePositioningSubtables.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16763,8 +16722,8 @@ #endif Index: icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SingleSubstitutionSubtables.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SingleSubstitutionSubtables.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16831,8 +16790,8 @@ TTGlyphID substitute = SWAPW(substituteArray[coverageIndex]); Index: icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SingleSubstitutionSubtables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SingleSubstitutionSubtables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SingleSubstitutionSubtables.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16871,8 +16830,8 @@ #endif Index: icu-4.8.1.1/source/layout/SingleTableProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SingleTableProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SingleTableProcessor.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SingleTableProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SingleTableProcessor.cpp 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16916,8 +16875,8 @@ glyphStorage[glyph] = SWAPW(lookupSingle->value); Index: icu-4.8.1.1/source/layout/SingleTableProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SingleTableProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SingleTableProcessor.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SingleTableProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SingleTableProcessor.h 2015-03-09 12:29:52.162000509 -0400 @@ -1,6 +1,6 @@ /* * @@ -16950,7 +16909,7 @@ Index: icu-4.8.1.1/source/layout/SingleTableProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SingleTableProcessor2.cpp 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/SingleTableProcessor2.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,52 @@ +/* + * @@ -17007,7 +16966,7 @@ Index: icu-4.8.1.1/source/layout/SingleTableProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SingleTableProcessor2.h 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/SingleTableProcessor2.h 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,57 @@ +/* + * @@ -17068,8 +17027,8 @@ +#endif Index: icu-4.8.1.1/source/layout/StateTableProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/StateTableProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/StateTableProcessor.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/StateTableProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/StateTableProcessor.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17140,8 +17099,8 @@ endStateTable(); Index: icu-4.8.1.1/source/layout/StateTableProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/StateTableProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/StateTableProcessor.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/StateTableProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/StateTableProcessor.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17186,7 +17145,7 @@ Index: icu-4.8.1.1/source/layout/StateTableProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/StateTableProcessor2.cpp 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/StateTableProcessor2.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,211 @@ +/* + * @@ -17402,7 +17361,7 @@ Index: icu-4.8.1.1/source/layout/StateTableProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/StateTableProcessor2.h 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/StateTableProcessor2.h 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,60 @@ +/* + * @@ -17466,8 +17425,8 @@ +#endif Index: icu-4.8.1.1/source/layout/StateTables.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/StateTables.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/StateTables.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/StateTables.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/StateTables.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17558,8 +17517,8 @@ Index: icu-4.8.1.1/source/layout/SubtableProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/SubtableProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SubtableProcessor.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SubtableProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SubtableProcessor.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17584,8 +17543,8 @@ subtableFeatures = SWAPL(subtableHeader->subtableFeatures); Index: icu-4.8.1.1/source/layout/SubtableProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/SubtableProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/SubtableProcessor.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/SubtableProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/SubtableProcessor.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17620,7 +17579,7 @@ Index: icu-4.8.1.1/source/layout/SubtableProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SubtableProcessor2.cpp 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/SubtableProcessor2.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,32 @@ +/* + * @@ -17657,7 +17616,7 @@ Index: icu-4.8.1.1/source/layout/SubtableProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/SubtableProcessor2.h 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/SubtableProcessor2.h 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,46 @@ +/* + * @@ -17707,8 +17666,8 @@ + Index: icu-4.8.1.1/source/layout/ThaiLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/ThaiLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ThaiLayoutEngine.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/ThaiLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ThaiLayoutEngine.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -1,7 +1,7 @@ /* @@ -17736,8 +17695,8 @@ // default is no adjustments Index: icu-4.8.1.1/source/layout/TibetanLayoutEngine.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/TibetanLayoutEngine.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/TibetanLayoutEngine.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/TibetanLayoutEngine.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/TibetanLayoutEngine.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17757,8 +17716,8 @@ fFeatureMap = TibetanReordering::getFeatureMap(fFeatureMapCount); Index: icu-4.8.1.1/source/layout/TibetanLayoutEngine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/TibetanLayoutEngine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/TibetanLayoutEngine.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/TibetanLayoutEngine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/TibetanLayoutEngine.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17778,8 +17737,8 @@ * This constructor is used when the font requires a "canned" GSUB table which can't be known Index: icu-4.8.1.1/source/layout/TrimmedArrayProcessor.cpp =================================================================== ---- icu-4.8.1.1.orig/source/layout/TrimmedArrayProcessor.cpp 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor.cpp 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/TrimmedArrayProcessor.cpp 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17826,8 +17785,8 @@ Index: icu-4.8.1.1/source/layout/TrimmedArrayProcessor.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/TrimmedArrayProcessor.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/TrimmedArrayProcessor.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -17860,7 +17819,7 @@ Index: icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.cpp 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.cpp 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,57 @@ +/* + * @@ -17922,7 +17881,7 @@ Index: icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.h 2015-02-27 15:30:42.781472661 -0500 ++++ icu-4.8.1.1/source/layout/TrimmedArrayProcessor2.h 2015-03-09 12:29:52.166000544 -0400 @@ -0,0 +1,60 @@ +/* + * @@ -17986,8 +17945,8 @@ + Index: icu-4.8.1.1/source/layout/ValueRecords.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/ValueRecords.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/ValueRecords.h 2015-02-27 15:30:42.781472661 -0500 +--- icu-4.8.1.1.orig/source/layout/ValueRecords.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/ValueRecords.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * @@ -18006,2247 +17965,444 @@ { Index: icu-4.8.1.1/source/layout/layout.vcxproj =================================================================== ---- icu-4.8.1.1.orig/source/layout/layout.vcxproj 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/layout.vcxproj 2015-02-27 15:30:42.785472694 -0500 -@@ -1,552 +1,579 @@ -- -- -- -- -- Debug -- Win32 -- -- -- Debug -- x64 -- -- -- Release -- Win32 -- -- -- Release -- x64 -- -- -- -- {C920062A-0647-4553-A3B2-37C58065664B} -- -- -- -- DynamicLibrary -- false -- MultiByte -- -- -- DynamicLibrary -- false -- MultiByte -- -- -- DynamicLibrary -- false -- MultiByte -- -- -- DynamicLibrary -- false -- MultiByte -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_ProjectFileVersion>10.0.30319.1 -- .\..\..\lib\ -- .\x86\Debug\ -- true -- .\..\..\lib\ -- .\x86\Release\ -- false -- .\x64\Debug\ -- .\x64\Debug\ -- true -- .\x64\Release\ -- .\x64\Release\ -- false -- -- -- -- _DEBUG;%(PreprocessorDefinitions) -- true -- true -- Win32 -- .\..\..\lib\iculed.tlb -- -- -- Disabled -- ..\..\include;..\common;%(AdditionalIncludeDirectories) -- WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -- EnableFastChecks -- MultiThreadedDebugDLL -- true -- true -- true -- .\x86\Debug/layout.pch -- .\x86\Debug/ -- .\x86\Debug/ -- .\x86\Debug/ -- true -- Level3 -- true -- EditAndContinue -- Default -- -- -- _DEBUG;%(PreprocessorDefinitions) -- 0x0409 -- ..\common;%(AdditionalIncludeDirectories) -- -- +--- icu-4.8.1.1.orig/source/layout/layout.vcxproj 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/layout.vcxproj 2015-03-09 12:29:52.166000544 -0400 +@@ -110,7 +110,7 @@ + ..\common;%(AdditionalIncludeDirectories) + + - ..\..\bin\icule48d.dll -- true -- true -- .\..\..\lib\iculed.pdb -- 0x4ac00000 -- false -- -- -- ..\..\lib\iculed.lib -- -- -- -- -- NDEBUG;%(PreprocessorDefinitions) -- true -- true -- Win32 -- .\..\..\lib\icule.tlb -- -- -- ..\..\include;..\common;%(AdditionalIncludeDirectories) -- WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -- true -- MultiThreadedDLL -- true -- true -- true -- .\x86\Release/layout.pch -- .\x86\Release/ -- .\x86\Release/ -- .\x86\Release/ -- Level3 -- true -- Default -- -- -- NDEBUG;%(PreprocessorDefinitions) -- 0x0409 -- ..\common;%(AdditionalIncludeDirectories) -- -- -- ..\..\bin\icule48.dll -- true -- .\..\..\lib\icule.pdb -- true -- 0x4ac00000 -- false -- -- -- ..\..\lib\icule.lib -- -- -- -- -- _DEBUG;%(PreprocessorDefinitions) -- true -- true -- X64 -- .\..\..\lib64\iculed.tlb -- -- -- Disabled -- ..\..\include;..\common;%(AdditionalIncludeDirectories) -- WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -- EnableFastChecks -- MultiThreadedDebugDLL -- true -- true -- true -- .\x64\Debug/layout.pch -- .\x64\Debug/ -- .\x64\Debug/ -- .\x64\Debug/ -- true -- Level3 -- true -- ProgramDatabase -- Default -- -- -- _DEBUG;%(PreprocessorDefinitions) -- 0x0409 -- ..\common;%(AdditionalIncludeDirectories) -- -- -- ..\..\bin64\icule48d.dll -- true -- true -- .\..\..\lib64\iculed.pdb -- 0x4ac00000 -- ..\..\lib64\iculed.lib -- MachineX64 -- -- -- -- -- NDEBUG;%(PreprocessorDefinitions) -- true -- true -- X64 -- .\..\..\lib64\icule.tlb -- -- -- ..\..\include;..\common;%(AdditionalIncludeDirectories) -- WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -- true -- MultiThreadedDLL -- true -- true -- true -- .\x64\Release/layout.pch -- .\x64\Release/ -- .\x64\Release/ -- .\x64\Release/ -- Level3 -- true -- Default -- -- -- NDEBUG;%(PreprocessorDefinitions) -- 0x0409 -- ..\common;%(AdditionalIncludeDirectories) -- -- -- ..\..\bin64\icule48.dll -- true -- .\..\..\lib64\icule.pdb -- true -- 0x4ac00000 -- ..\..\lib64\icule.lib -- MachineX64 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- -- -- -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- copy "%(FullPath)" ..\..\include\layout -- -- ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} -- false -- -- -- -- -- -- -+ -+ -+ -+ -+ Debug -+ Win32 -+ -+ -+ Debug -+ x64 -+ -+ -+ Release -+ Win32 -+ -+ -+ Release -+ x64 -+ -+ -+ -+ {C920062A-0647-4553-A3B2-37C58065664B} -+ -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ -+ -+ DynamicLibrary -+ false -+ MultiByte -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ <_ProjectFileVersion>10.0.30319.1 -+ .\..\..\lib\ -+ .\x86\Debug\ -+ true -+ .\..\..\lib\ -+ .\x86\Release\ -+ false -+ .\x64\Debug\ -+ .\x64\Debug\ -+ true -+ .\x64\Release\ -+ .\x64\Release\ -+ false -+ -+ -+ -+ _DEBUG;%(PreprocessorDefinitions) -+ true -+ true -+ Win32 -+ .\..\..\lib\iculed.tlb -+ -+ -+ Disabled -+ ..\..\include;..\common;%(AdditionalIncludeDirectories) -+ WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ true -+ true -+ true -+ .\x86\Debug/layout.pch -+ .\x86\Debug/ -+ .\x86\Debug/ -+ .\x86\Debug/ -+ true -+ Level3 -+ true -+ EditAndContinue -+ Default -+ -+ -+ _DEBUG;%(PreprocessorDefinitions) -+ 0x0409 -+ ..\common;%(AdditionalIncludeDirectories) -+ -+ + ..\..\bin\icule51d.dll -+ true -+ true -+ .\..\..\lib\iculed.pdb -+ 0x4ac00000 -+ false -+ -+ -+ ..\..\lib\iculed.lib -+ -+ -+ -+ -+ NDEBUG;%(PreprocessorDefinitions) -+ true -+ true -+ Win32 -+ .\..\..\lib\icule.tlb -+ -+ -+ ..\..\include;..\common;%(AdditionalIncludeDirectories) -+ WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -+ true -+ MultiThreadedDLL -+ true -+ true -+ true -+ .\x86\Release/layout.pch -+ .\x86\Release/ -+ .\x86\Release/ -+ .\x86\Release/ -+ Level3 -+ true -+ Default -+ -+ -+ NDEBUG;%(PreprocessorDefinitions) -+ 0x0409 -+ ..\common;%(AdditionalIncludeDirectories) -+ -+ + true + true + .\..\..\lib\iculed.pdb +@@ -151,7 +151,7 @@ + ..\common;%(AdditionalIncludeDirectories) + + +- ..\..\bin\icule48.dll + ..\..\bin\icule51.dll -+ true -+ .\..\..\lib\icule.pdb -+ true -+ 0x4ac00000 -+ false -+ -+ -+ ..\..\lib\icule.lib -+ -+ -+ -+ -+ _DEBUG;%(PreprocessorDefinitions) -+ true -+ true -+ X64 -+ .\..\..\lib64\iculed.tlb -+ -+ -+ Disabled -+ ..\..\include;..\common;%(AdditionalIncludeDirectories) -+ WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ true -+ true -+ true -+ .\x64\Debug/layout.pch -+ .\x64\Debug/ -+ .\x64\Debug/ -+ .\x64\Debug/ -+ true -+ Level3 -+ true -+ ProgramDatabase -+ Default -+ -+ -+ _DEBUG;%(PreprocessorDefinitions) -+ 0x0409 -+ ..\common;%(AdditionalIncludeDirectories) -+ -+ + true + .\..\..\lib\icule.pdb + true +@@ -195,7 +195,7 @@ + ..\common;%(AdditionalIncludeDirectories) + + +- ..\..\bin64\icule48d.dll + ..\..\bin64\icule51d.dll -+ true -+ true -+ .\..\..\lib64\iculed.pdb -+ 0x4ac00000 -+ ..\..\lib64\iculed.lib -+ MachineX64 -+ -+ -+ -+ -+ NDEBUG;%(PreprocessorDefinitions) -+ true -+ true -+ X64 -+ .\..\..\lib64\icule.tlb -+ -+ -+ ..\..\include;..\common;%(AdditionalIncludeDirectories) -+ WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_LAYOUT_IMPLEMENTATION;%(PreprocessorDefinitions) -+ true -+ MultiThreadedDLL -+ true -+ true -+ true -+ .\x64\Release/layout.pch -+ .\x64\Release/ -+ .\x64\Release/ -+ .\x64\Release/ -+ Level3 -+ true -+ Default -+ -+ -+ NDEBUG;%(PreprocessorDefinitions) -+ 0x0409 -+ ..\common;%(AdditionalIncludeDirectories) -+ -+ + true + true + .\..\..\lib64\iculed.pdb +@@ -234,7 +234,7 @@ + ..\common;%(AdditionalIncludeDirectories) + + +- ..\..\bin64\icule48.dll + ..\..\bin64\icule51.dll -+ true -+ .\..\..\lib64\icule.pdb -+ true -+ 0x4ac00000 -+ ..\..\lib64\icule.lib -+ MachineX64 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + true + .\..\..\lib64\icule.pdb + true +@@ -251,7 +251,9 @@ + + + + -+ + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -268,11 +270,13 @@ + + + + -+ -+ -+ -+ -+ + + + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -282,6 +286,7 @@ + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -293,30 +298,39 @@ + + + + -+ -+ -+ + + + + -+ -+ -+ -+ -+ -+ + + + + + + + -+ + + -+ -+ + + + -+ -+ -+ + + + + -+ + + -+ -+ + + + -+ -+ -+ -+ -+ -+ + + + + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -329,8 +343,10 @@ + + + + -+ -+ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -347,12 +363,14 @@ + + + + -+ -+ -+ -+ -+ -+ + + + + + + + -+ -+ -+ -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ + + + +@@ -486,6 +504,7 @@ + + + + -+ -+ -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ copy "%(FullPath)" ..\..\include\layout -+ -+ ..\..\include\layout\%(Filename)%(Extension);%(Outputs) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + copy "%(FullPath)" ..\..\include\layout +@@ -514,6 +533,7 @@ + + + + -+ -+ -+ -+ -+ -+ -+ + + + +@@ -521,20 +541,27 @@ + + + + -+ + + -+ + + -+ -+ -+ + + + + -+ + + -+ -+ -+ + + + + -+ -+ -+ -+ -+ + + + + + + -+ -+ -+ -+ -+ -+ -+ -+ {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} -+ false -+ -+ -+ -+ -+ + + + +@@ -549,4 +576,4 @@ + + + +- + \ No newline at end of file Index: icu-4.8.1.1/source/layout/layout.vcxproj.filters =================================================================== ---- icu-4.8.1.1.orig/source/layout/layout.vcxproj.filters 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/layout.vcxproj.filters 2015-02-27 15:30:42.785472694 -0500 -@@ -1,508 +1,589 @@ -- -- -- -- -- {612bee68-b22e-47ed-8cb2-2c5ca5ea6350} -- cpp;c;cxx;rc;def;r;odl;idl;hpj;bat -- -- -- {6ccc0372-c74a-4a85-b31a-da1c0c72b56d} -- h;hpp;hxx;hm;inl -- -- -- {ea7162f2-e3c7-47a7-98aa-e19c06f9e195} -- ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe -- -- -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- -- -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- -- -- Resource Files -- -- -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -- Header Files -- -- -+ -+ -+ -+ -+ {612bee68-b22e-47ed-8cb2-2c5ca5ea6350} -+ cpp;c;cxx;rc;def;r;odl;idl;hpj;bat -+ -+ -+ {6ccc0372-c74a-4a85-b31a-da1c0c72b56d} -+ h;hpp;hxx;hm;inl -+ -+ -+ {ea7162f2-e3c7-47a7-98aa-e19c06f9e195} -+ ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe -+ -+ -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ +--- icu-4.8.1.1.orig/source/layout/layout.vcxproj.filters 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/layout.vcxproj.filters 2015-03-09 12:29:52.166000544 -0400 +@@ -36,9 +36,15 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -87,6 +93,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -102,6 +111,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -129,6 +141,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -162,6 +177,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -171,6 +189,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -189,15 +210,24 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -207,15 +237,24 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ + + Source Files + +@@ -234,6 +273,9 @@ + + Source Files + + + Source Files + -+ -+ Source Files -+ -+ -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Source Files + +@@ -266,12 +308,18 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -320,6 +368,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -338,6 +389,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -359,6 +413,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -401,6 +458,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -422,12 +482,21 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ + + Header Files + + + Header Files + -+ -+ Header Files -+ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -437,9 +506,15 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -449,6 +524,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ + + Header Files + +@@ -464,6 +542,9 @@ + + Header Files + + + Header Files + -+ -+ Header Files -+ -+ -+ -+ -+ Resource Files -+ -+ -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ - -\ No newline at end of file + + Header Files + Index: icu-4.8.1.1/source/layout/loengine.h =================================================================== ---- icu-4.8.1.1.orig/source/layout/loengine.h 2015-02-27 15:30:42.785472694 -0500 -+++ icu-4.8.1.1/source/layout/loengine.h 2015-02-27 15:30:42.785472694 -0500 +--- icu-4.8.1.1.orig/source/layout/loengine.h 2015-03-09 12:29:52.170000580 -0400 ++++ icu-4.8.1.1/source/layout/loengine.h 2015-03-09 12:29:52.166000544 -0400 @@ -1,6 +1,6 @@ /* * diff -Nru icu-4.8.1.1/debian/patches/series icu-4.8.1.1/debian/patches/series --- icu-4.8.1.1/debian/patches/series 2015-03-06 16:35:50.000000000 +0000 +++ icu-4.8.1.1/debian/patches/series 2015-03-09 15:15:02.000000000 +0000 @@ -9,9 +9,9 @@ CVE-2013-0900.patch CVE-2013-2924.patch two-digit-year-test.patch -#layoutengine-security.patch -#CVE-2014-65xx.patch CVE-2014-7923.patch CVE-2014-7926.patch CVE-2014-7940.patch CVE-2014-9654.patch +layoutengine-security.patch +CVE-2014-65xx.patch