diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-03-11 09:03:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-11 09:03:27 +0000 |
commit | 4c4f86df0cb7afbdb1257045087c686495b033c1 (patch) | |
tree | 24ec3fc9050919a6d3f2f623459d487097ca43ff /icu | |
parent | Fix spacing in patch (diff) | |
download | core-4c4f86df0cb7afbdb1257045087c686495b033c1.tar.gz core-4c4f86df0cb7afbdb1257045087c686495b033c1.zip |
restore build of build patch that seem to still make sense
Diffstat (limited to 'icu')
-rw-r--r-- | icu/icu4c-4_0_1-src.patch | 260 | ||||
-rw-r--r-- | icu/icu4c-build.patch | 117 | ||||
-rw-r--r-- | icu/icu4c.8320.freeserif.crash.patch | 8 | ||||
-rw-r--r-- | icu/makefile.mk | 2 |
4 files changed, 123 insertions, 264 deletions
diff --git a/icu/icu4c-4_0_1-src.patch b/icu/icu4c-4_0_1-src.patch deleted file mode 100644 index 6d50ca634d4e..000000000000 --- a/icu/icu4c-4_0_1-src.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 -+++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 -@@ -52,7 +52,7 @@ - Poorly upgraded Solaris machines can't have this defined. - Cleanly installed Solaris can use this #define. - */ --#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) -+#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) - #define _XOPEN_SOURCE_EXTENDED 1 - #endif - ---- misc/icu/source/common/unicode/pwin32.h 2008-07-01 10:41:12.000000000 +0900 -+++ misc/build/icu/source/common/unicode/pwin32.h 2008-11-05 22:37:21.479250000 +0900 -@@ -32,6 +32,10 @@ - #define __STDC_CONSTANT_MACROS - #endif - -+#if defined(__MINGW32__) -+#define U_HAVE_INTTYPES_H 1 -+#endif -+ - /* _MSC_VER is used to detect the Microsoft compiler. */ - #if defined(_MSC_VER) - #define U_INT64_IS_LONG_LONG 0 ---- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 -+++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 -@@ -25,7 +25,7 @@ - SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) - - ## Compiler switches to embed a library name and version information --LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) - - ## Compiler switch to embed a runtime search path - LD_RPATH= -@@ -41,10 +41,6 @@ - ## Non-shared intermediate object suffix - STATIC_O = ao - --## Override Versioned target for a shared library. --FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) --MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) -- - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -@@ -76,15 +72,9 @@ - - ## Versioned libraries rules - --%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) - $(RM) $@ && ln -s ${<F} $@ --%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) -- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@ -- --# tzcode option --TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED -- --# genren opts --GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt' -+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) -+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ - - ## End Darwin-specific setup ---- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100 -+++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200 -@@ -20,6 +20,14 @@ - LD_RPATH= - LD_RPATH_PRE = -Wl,-rpath, - -+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -+## (incl. the C++ runtime libs potentially found in the URE lib dir): -+ENABLE_RPATH=YES -+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' -+ -+#SH# ENABLE_RPATH=YES -+#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" -+ - ## These are the library specific LDFLAGS - LDFLAGSICUDT=-nodefaultlibs -nostdlib - ---- misc/icu/source/config/mh-mingw 2008-07-01 10:41:24.000000000 +0900 -+++ misc/build/icu/source/config/mh-mingw 2008-11-06 00:18:30.261250000 +0900 -@@ -72,10 +72,12 @@ - # The #M# is used to delete lines for icu-config - # Current full path directory. - #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS --CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell -+CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell - # Current full path directory for use in source code in a -D compiler option. - #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS --CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell -+CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell -+SRCDIR_DEPEND=$(shell cd $(SRCDIR) && pwd) -+DATAFILEPATHS_DEPEND=$(foreach p,$(DATAFILEPATHS),$(shell cd $(dir $(p)) && pwd)/$(notdir $(p))) - - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c ---- misc/icu/source/config/mh-solaris 2008-07-01 03:41:26.000000000 +0200 -+++ misc/build/icu/source/config/mh-solaris 2009-02-17 11:54:45.105890123 +0100 -@@ -18,17 +18,24 @@ - - ## Commands to link - ## For Sun Workshop, use CC to link to bring in C++ runtime --LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) --LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -+LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath -+LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath - - ## Commands to make a shared library - SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -G --SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -+SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -norunpath - - ## Compiler switch to embed a runtime search path - LD_RPATH= -R - LD_RPATH_PRE= - -+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -+ENABLE_RPATH=YES -+RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' -+ -+#SH# ENABLE_RPATH=YES -+#SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" -+ - #LIBRARY_PATH_PREFIX=/usr/lib/lwp: - - ## Compiler switch to embed a library name ---- misc/icu/source/layout/ArabicShaping.cpp 2008-07-01 03:42:04.000000000 +0200 -+++ misc/build/icu/source/layout/ArabicShaping.cpp 2009-02-17 12:04:34.264869737 +0100 -@@ -79,7 +79,6 @@ - #define markFeatureMask 0x00040000UL - #define mkmkFeatureMask 0x00020000UL - --#define NO_FEATURES 0 - #define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask) - - #define SHAPE_MASK 0xF0000000UL -@@ -174,11 +173,7 @@ - LEUnicode c = chars[in]; - ShapeType t = getShapeType(c); - -- if (t == ST_NOSHAPE_NONE) { -- glyphStorage.setAuxData(out, NO_FEATURES, success); -- } else { -- glyphStorage.setAuxData(out, ISOL_FEATURES, success); -- } -+ glyphStorage.setAuxData(out, ISOL_FEATURES, success); - - if ((t & MASK_TRANSPARENT) != 0) { - continue; ---- misc/icu/source/layoutex/ParagraphLayout.cpp 2008-07-01 03:42:02.000000000 +0200 -+++ misc/build/icu/source/layoutex/ParagraphLayout.cpp 2008-12-01 19:32:58.000000000 +0100 -@@ -868,7 +868,7 @@ - - return nullLanguageCode; - } --#elif -+#else - - // TODO - dummy implementation for right now... - le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) ---- misc/icu/source/tools/pkgdata/cmnmode.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/cmnmode.c 2008-11-07 00:03:32.393500000 +0900 -@@ -69,7 +69,11 @@ - sprintf(tmp, "# List file for gencmn:\n" - "CMNLIST=%s%s%s_common.lst\n\n", - o->tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING, -+#else - U_FILE_SEP_STRING, -+#endif - o->shortName); - T_FileStream_writeLine(makefile, tmp); - ---- misc/icu/source/tools/pkgdata/dllmode.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/dllmode.c 2008-11-07 06:08:36.016750000 +0900 -@@ -139,7 +139,11 @@ - sprintf(tmp, "# List file for gencmn:\n" - "CMNLIST=%s%s$(NAME)_dll.lst\n\n", - o->tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING); -+#else - U_FILE_SEP_STRING); -+#endif - T_FileStream_writeLine(makefile, tmp); - - if(o->hadStdin == FALSE) { /* shortcut */ ---- misc/icu/source/tools/pkgdata/make.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/make.c 2008-11-06 23:23:04.096625000 +0900 -@@ -313,8 +313,13 @@ - uprv_strcpy(cfile+uprv_strlen(cfile)-uprv_strlen(objSuffix), ".c" ); /* replace .o with .c */ - - /* Make up parents.. */ -+#ifdef __MINGW32__ -+ parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR_DEPEND)/")); -+ sprintf(parentPath, "$(SRCDIR_DEPEND)/%s", baseName); -+#else - parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR)/")); - sprintf(parentPath, "$(SRCDIR)/%s", baseName); -+#endif - parents = pkg_appendToList(parents, NULL, parentPath); - - /* make up commands.. */ -@@ -379,7 +384,11 @@ - T_FileStream_writeLine(f, "\n"); - T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n"); - T_FileStream_writeLine(f, "\n"); -+#ifdef __MINGW32__ -+ T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS_DEPEND)\n"); -+#else - T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS)\n"); -+#endif - T_FileStream_writeLine(f, "\t$(INVOKE) $(ICUPKG) -t$(ICUDATA_CHAR) -c -s $(SRCDIR) -a $(CMNLIST) new $(TEMP_DIR)/$(CNAME).dat\n"); - T_FileStream_writeLine(f, "\n"); - T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME).dat\n"); ---- misc/icu/source/tools/pkgdata/pkgdata.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/pkgdata.c 2008-11-07 05:59:27.110500000 +0900 -@@ -594,7 +594,11 @@ - exit(U_ILLEGAL_ARGUMENT_ERROR); - } - uprv_strcpy(tmp, o->srcDir); -+#ifdef __MINGW32__ -+ uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_ALT_SEP_STRING); -+#else - uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_SEP_STRING); -+#endif - uprv_strcat(tmp, s); - o->filePaths = pkg_appendToList(o->filePaths, &tail2, uprv_strdup(tmp)); - linePtr = lineNext; ---- misc/icu/source/tools/pkgdata/sttcmode.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/sttcmode.c 2008-11-07 00:30:05.690375000 +0900 -@@ -172,7 +172,11 @@ - sprintf(tmp, "# List file for gencmn:\n" - "CMNLIST=%s%s$(NAME)_static.lst\n\n", - o->tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING); -+#else - U_FILE_SEP_STRING); -+#endif - T_FileStream_writeLine(makefile, tmp); - - if(o->hadStdin == FALSE) { /* shortcut */ ---- misc/build/icu/source/test/intltest/dtifmtts.cpp.old 2010-09-20 20:49:33.953125000 +0200 -+++ misc/build/icu/source/test/intltest/dtifmtts.cpp 2010-09-20 20:51:37.875000000 +0200 -@@ -13,8 +13,9 @@ - //FIXME: define it in compiler flag - //#define DTIFMTTS_DEBUG 1 - -- -+#if defined (_MSC_VER) && (_MSC_VER < 1600) - #include <iostream> -+#endif - #ifdef DTIFMTTS_DEBUG - #endif - diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch new file mode 100644 index 000000000000..7fa5e8e58cb7 --- /dev/null +++ b/icu/icu4c-build.patch @@ -0,0 +1,117 @@ +--- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 ++++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 +@@ -52,7 +52,7 @@ + Poorly upgraded Solaris machines can't have this defined. + Cleanly installed Solaris can use this #define. + */ +-#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) || defined(__xlc__)) ++#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) || defined(__xlc__)) + #define _XOPEN_SOURCE_EXTENDED 1 + #endif + +--- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 ++++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 +@@ -25,7 +25,7 @@ + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) + + ## Compiler switches to embed a library name and version information +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -41,10 +41,6 @@ + ## Non-shared intermediate object suffix + STATIC_O = ao + +-## Override Versioned target for a shared library. +-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) +-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) +- + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< +@@ -76,16 +72,10 @@ + + ## Versioned libraries rules + +-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) + $(RM) $@ && ln -s ${<F} $@ +-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) +- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@ +- +-# tzcode option +-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED +- +-# genren opts +-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt' ++%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) ++ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ + + ## Remove shared library 's' + STATIC_PREFIX_WHEN_USED = +--- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100 ++++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200 +@@ -20,6 +20,11 @@ + LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + ++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH ++## (incl. the C++ runtime libs potentially found in the URE lib dir): ++ENABLE_RPATH=YES ++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' ++ + ## These are the library specific LDFLAGS + LDFLAGSICUDT=-nodefaultlibs -nostdlib + +--- misc/icu/source/config/mh-solaris 2008-07-01 03:41:26.000000000 +0200 ++++ misc/build/icu/source/config/mh-solaris 2009-02-17 11:54:45.105890123 +0100 +@@ -36,17 +36,21 @@ + + ## Commands to link + ## For Sun Workshop, use CC to link to bring in C++ runtime +-LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) +-LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) ++LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath ++LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath + + ## Commands to make a shared library + SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -G +-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G ++SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -norunpath + + ## Compiler switch to embed a runtime search path + LD_RPATH= -R'$$'ORIGIN + LD_RPATH_PRE= -R + ++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH ++ENABLE_RPATH=YES ++RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' ++ + #LIBRARY_PATH_PREFIX=/usr/lib/lwp: + + ## Compiler switch to embed a library name +--- misc/icu/source/layout/ArabicShaping.cpp 2008-07-01 03:42:04.000000000 +0200 ++++ misc/build/icu/source/layout/ArabicShaping.cpp 2009-02-17 12:04:34.264869737 +0100 +@@ -79,7 +79,6 @@ + #define markFeatureMask 0x00040000UL + #define mkmkFeatureMask 0x00020000UL + +-#define NO_FEATURES 0 + #define ISOL_FEATURES (isolFeatureMask | ligaFeatureMask | msetFeatureMask | markFeatureMask | ccmpFeatureMask | rligFeatureMask | caltFeatureMask | dligFeatureMask | cswhFeatureMask | cursFeatureMask | kernFeatureMask | mkmkFeatureMask) + + #define SHAPE_MASK 0xF0000000UL +@@ -174,11 +173,7 @@ + LEUnicode c = chars[in]; + ShapeType t = getShapeType(c); + +- if (t == ST_NOSHAPE_NONE) { +- glyphStorage.setAuxData(out, NO_FEATURES, success); +- } else { +- glyphStorage.setAuxData(out, ISOL_FEATURES, success); +- } ++ glyphStorage.setAuxData(out, ISOL_FEATURES, success); + + if ((t & MASK_TRANSPARENT) != 0) { + continue; diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch index 64b133d21608..32e851c36d36 100644 --- a/icu/icu4c.8320.freeserif.crash.patch +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -1,6 +1,6 @@ --- misc/icu/source/layout/LookupProcessor.h 2011-02-03 09:20:27.657005678 +0000 +++ misc/build/icu/source/layout/LookupProcessor.h 2011-02-03 09:25:34.498396208 +0000 -@@ -58,6 +58,7 @@ +@@ -65,6 +65,7 @@ const FeatureListTable *featureListTable; FeatureMask *lookupSelectArray; @@ -31,7 +31,9 @@ lookupSelectArray[lookupListIndex] |= featureMask; lookupOrderArray[store++] = lookupListIndex; } -@@ -124,5 +131,5 @@ +@@ -122,7 +129,7 @@ + Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, + LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures, LEErrorCode& success) - : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), + : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0), @@ -47,7 +49,7 @@ le_int32 count, order = 0; le_int32 featureReferences = 0; const FeatureTable *featureTable = NULL; -@@ -186,6 +197,10 @@ +@@ -186,6 +195,10 @@ le_uint16 featureIndex = SWAPW(langSysTable->featureIndexArray[feature]); featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag); diff --git a/icu/makefile.mk b/icu/makefile.mk index 6b1937578434..e8dee27956f5 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -45,9 +45,9 @@ TARFILE_ROOTDIR=icu #http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif PATCH_FILES=\ + icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch -# ${TARFILE_NAME}.patch \ .IF "$(GUI)"=="UNX" |