icu patches for cygwin build

git-svn-id: svn://tug.org/texlive/trunk@13649 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 9 insertions, 13 deletions

diff --git a/Build/source/libs/icu/icu-xetex/config/mh-cygwin b/Build/source/libs/icu/icu-xetex/config/mh-cygwin
index aa58e0e9611..263b3ec118b 100644
--- a/Build/source/libs/icu/icu-xetex/config/mh-cygwin
+++ b/Build/source/libs/icu/icu-xetex/config/mh-cygwin
@@ -46,10 +46,6 @@ SO = dll
 STATIC_O = ao
 LIBICU = cyg$(ICUPREFIX)
 
-# Change the stubnames so that poorly working FAT disks and installation programs can work.
-# This is also for backwards compatibility.
-DATA_STUBNAME = dt
-I18N_STUBNAME = in
 
 ## Compilation rules
 %.$(STATIC_O): $(srcdir)/%.c
diff --git a/Build/source/libs/icu/icu-xetex/layout/Features.cpp b/Build/source/libs/icu/icu-xetex/layout/Features.cpp
index e1c81a1ac9b..72abc22735f 100644
--- a/Build/source/libs/icu/icu-xetex/layout/Features.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/Features.cpp
@@ -8,7 +8,7 @@
 #include "LETypes.h"
 #include "OpenTypeUtilities.h"
 #include "OpenTypeTables.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
diff --git a/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp
index 6f923a1389c..e192a8149ca 100644
--- a/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp
@@ -6,7 +6,7 @@
 #include "LETypes.h"
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "Lookups.h"
 #include "ScriptAndLanguage.h"
 #include "GlyphDefinitionTables.h"
diff --git a/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h
index ee3606565d3..9327e4dc0c0 100644
--- a/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h
@@ -15,7 +15,7 @@
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
 #include "Lookups.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "GlyphDefinitionTables.h"
 #include "GlyphPositioningTables.h"
 #include "GlyphIterator.h"
diff --git a/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp
index eb25680cce1..603c3808a2f 100644
--- a/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp
@@ -8,7 +8,7 @@
 #include "LEGlyphFilter.h"
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "Lookups.h"
 #include "ScriptAndLanguage.h"
 #include "GlyphDefinitionTables.h"
diff --git a/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h
index d8c5684a03b..29f4a0a04aa 100644
--- a/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h
@@ -16,7 +16,7 @@
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
 #include "Lookups.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "GlyphDefinitionTables.h"
 #include "GlyphSubstitutionTables.h"
 #include "GlyphIterator.h"
diff --git a/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp
index 6f26a13bedb..f1139f15098 100644
--- a/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp
@@ -8,7 +8,7 @@
 #include "OpenTypeUtilities.h"
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "Lookups.h"
 #include "ScriptAndLanguage.h"
 #include "GlyphDefinitionTables.h"
diff --git a/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h
index bc05ae63b79..a0fd3e5c1f0 100644
--- a/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h
@@ -17,7 +17,7 @@
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
 //#include "Lookups.h"
-//#include "Features.h"
+//#include "ICUFeatures.h"
 
 U_NAMESPACE_BEGIN
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
index 1ce80956461..8395003bdbc 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
@@ -36,7 +36,7 @@ authorization from SIL International.
 
 #include "XeTeXswap.h"
 
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "GlyphPositioningTables.h"
 
 #include "sfnt.h"
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
index 77b11572706..d8827416bb4 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
@@ -45,7 +45,7 @@ authorization from SIL International.
 #include "XeTeXGrLayout.h"
 #endif
 
-#include "Features.h"
+#include "ICUFeatures.h"
 #include "ScriptAndLanguage.h"
 
 #include "unicode/ubidi.h"