[ooo-build-commit] .: patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Sep 23 04:39:38 PDT 2010
patches/dev300/apply | 8
patches/dev300/icu-4.2.1.diff | 451 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 457 insertions(+), 2 deletions(-)
New commits:
commit e26fb9a5c3886184ed3565eb1ee4ffd44831c1a2
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Sep 23 13:37:51 2010 +0200
Updated internal ICU to 4.2.1
This was need to move the ordinal suffix autocorrection work out of
Experimental.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c80354d..f0da6d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -177,6 +177,9 @@ ok-cancel-btn-add-accel.diff, kohei
# nss-3.12.0 does not support all the newly used features
xmlsecurity-build-with-nss-3.12.0.diff, i#114417, pmladek
+# Upgraded internal ICU to 4.2.1
+icu-4.2.1.diff, cbosdo
+
[ TemporaryHacks ]
# add idl target to toplevel makefile
@@ -1734,8 +1737,6 @@ transogl-buildfix-mesa-7.0.3.diff, pmladek
[ Experimental ]
# sal_uInt32 -> sal_uIntPtr for events on some places
events-intptr.diff, i#59411, jholesov
-# internationalized ordinal suffix autocorrection. Needs ICU 4.2
-svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
[ DebianEtchOnly ]
hunspell-lib-use-_pic.diff, rengelha
@@ -2072,6 +2073,9 @@ icu-arm.diff, doko
svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
+# internationalized ordinal suffix autocorrection. Needs ICU 4.2
+svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
+
# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
diff --git a/patches/dev300/icu-4.2.1.diff b/patches/dev300/icu-4.2.1.diff
new file mode 100644
index 0000000..96ab281
--- /dev/null
+++ b/patches/dev300/icu-4.2.1.diff
@@ -0,0 +1,451 @@
+diff --git icu/icu4c-4_0_1-src.patch icu/icu4c-4_0_1-src.patch
+deleted file mode 100644
+index 172d624..0000000
+--- icu/icu4c-4_0_1-src.patch
++++ /dev/null
+@@ -1,247 +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 */
+diff --git icu/icu4c-4_2_1-src.patch icu/icu4c-4_2_1-src.patch
+new file mode 100644
+index 0000000..efa4ef3
+--- /dev/null
++++ icu/icu4c-4_2_1-src.patch
+@@ -0,0 +1,146 @@
++--- misc/icu/source/common/putil.c
+++++ misc/build/icu/source/common/putil.c
++@@ -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
+++++ misc/build/icu/source/common/unicode/pwin32.h
++@@ -31,6 +31,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
+++++ misc/build/icu/source/config/mh-darwin
++@@ -25,7 +25,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS)
++ 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 @@ SO= dylib
++ ## 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 @@ MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
++
++ ## 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
+++++ misc/build/icu/source/config/mh-linux
++@@ -20,6 +20,14 @@ LIBCPPFLAGS =
++ 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
+++++ misc/build/icu/source/config/mh-mingw
++@@ -76,6 +76,8 @@ 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))#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
+++++ misc/build/icu/source/config/mh-solaris
++@@ -18,17 +18,24 @@ THREADSCXXFLAGS += -mt
++
++ ## 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
+++++ misc/build/icu/source/layout/ArabicShaping.cpp
++@@ -79,7 +79,6 @@ ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
++ #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 @@ void ArabicShaping::shape(const LEUnicode *chars, le_int32 offset, le_int32 char
++ 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 icu/icuversion.mk icu/icuversion.mk
+index eedf627..1fc9ecb 100755
+--- icu/icuversion.mk
++++ icu/icuversion.mk
+@@ -27,7 +27,7 @@
+ # major
+ ICU_MAJOR=4
+ # minor
+-ICU_MINOR=0
++ICU_MINOR=2
+ # micro
+ ICU_MICRO=1
+
+diff --git icu/makefile.mk icu/makefile.mk
+index 2fafcfa..acf0630 100644
+--- icu/makefile.mk
++++ icu/makefile.mk
+@@ -39,7 +39,7 @@ TARGET=so_icu
+
+ .IF "$(ICU_MICRO)"!="0"
+ TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src
+-TARFILE_MD5=2f6ecca935948f7db92d925d88d0d078
++TARFILE_MD5=e3738abd0d3ce1870dc1fd1f22bba5b1
+ .ELSE
+ TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src
+ TARFILE_MD5=
+diff --git ooo.lst ooo.lst
+index 3e379fa..68105a8 100755
+--- ooo.lst
++++ ooo.lst
+@@ -14,7 +14,6 @@ http://hg.services.openoffice.org/binaries
+ 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+ 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+ 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+-2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
+ ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
+ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+@@ -75,6 +74,7 @@ http://download.go-oo.org/src
+ 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
+ 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
++e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
+ http://download.go-oo.org/SRC680
+ 799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
+ db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
More information about the ooo-build-commit
mailing list