diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-08 13:37:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-08 13:37:56 +0000 |
| commit | cb6ac318a76140a387ead48c8741e298bb37f0ce (patch) | |
| tree | 68f0e25433ba49b628d5003f90ea6893da48ce61 /icu | |
| parent | 5cdde801ee4b4b0d0fe2a77c2e9e35a36f05ba10 (diff) | |
CWS-TOOLING: integrate CWS gcc44
2008-12-03 15:13:15 +0100 cmc r264790 : shrink patch
2008-12-03 14:26:43 +0100 cmc r264776 : shrink patch
2008-12-02 16:24:53 +0100 rene r264718 : revert, thanks sb
2008-12-02 10:47:21 +0100 rene r264675 : apply https://svn.boost.org/trac/boost/attachment/ticket/2069/0001-boost.mpl-gcc-4.4-fixes.patch for gcc 4.4 support (unbreaks at least canvas' build)
2008-12-01 22:08:16 +0100 rene r264643 : missing include (already needed for gcc 4.3)
2008-12-01 22:07:07 +0100 rene r264642 : allow gcc 4.4
2008-12-01 22:06:34 +0100 rene r264641 : fix conditional so that it builds with gcc 4.4 (patch from http://bugs.debian.org/505371)
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu-4.0.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/icu/icu-4.0.patch b/icu/icu-4.0.patch index f2ef12ac0236..5608b73829d6 100644 --- a/icu/icu-4.0.patch +++ b/icu/icu-4.0.patch @@ -11,15 +11,6 @@ --- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 +++ misc/build/icu/source/config/mh-darwin Fri Oct 31 09:13:56 2008 -@@ -1,7 +1,7 @@ - ## -*-makefile-*- - ## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor - ## to Rhapsody, aka Mac OS X Server) --## Copyright (c) 1999-2008 International Business Machines Corporation and -+## Copyright (c) 1999-2006 International Business Machines Corporation and - ## others. All Rights Reserved. - - ## Flags for position independent code @@ -25,7 +25,7 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) @@ -106,3 +97,14 @@ #LIBRARY_PATH_PREFIX=/usr/lib/lwp: ## Compiler switch to embed a library name +--- 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) |