icu/icu4c-rpath.patch | 2 +- icu/icu4c-wchar_t.patch | 4 ++-- icu/icu4c.8320.freeserif.crash.patch | 21 --------------------- icu/makefile.mk | 4 ---- 4 files changed, 3 insertions(+), 28 deletions(-)
New commits: commit 1b6e55eb350e22147a22ad22c1c4f08fc6ed19f5 Author: Tor Lillqvist <[email protected]> Date: Wed Nov 28 09:10:02 2012 +0200 De-fuzz Change-Id: I47e206350331e3edeef9edcb0514eacb66db7c07 diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch index bd625e9..44ab8a6 100644 --- a/icu/icu4c-rpath.patch +++ b/icu/icu4c-rpath.patch @@ -22,7 +22,7 @@ --- misc/icu/source/config/mh-linux 2010-09-29 20:37:36.000000000 +0200 +++ misc/build/icu/source/config/mh-linux 2011-03-15 10:56:26.653056004 +0100 @@ -20,6 +20,11 @@ - LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + 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 diff --git a/icu/icu4c-wchar_t.patch b/icu/icu4c-wchar_t.patch index bb788dc..2360a08 100644 --- a/icu/icu4c-wchar_t.patch +++ b/icu/icu4c-wchar_t.patch @@ -11,5 +11,5 @@ +CFLAGS+=/GF /nologo /Zc:wchar_t- +CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t- CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE - DEFS+=-DWIN32 - DEFS+=-DCYGWINMSVC + DEFS+=-DWIN32 -DCYGWINMSVC + LDFLAGS+=/nologo commit 36f2d5266a0fdea67d8868048341fb0638184756 Author: Tor Lillqvist <[email protected]> Date: Wed Nov 28 09:02:21 2012 +0200 icu4c.8320.freeserif.crash.patch is already in the ICU we use It added code that already was there. Change-Id: I766184e4996a4abcd3f2b383c1aae3b558954fbd diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch deleted file mode 100644 index 2d181d3..0000000 --- a/icu/icu4c.8320.freeserif.crash.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000 -+++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000 -@@ -111,6 +115,9 @@ - for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) { - le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]); - -+ if (lookupListIndex >= lookupSelectCount) -+ continue; -+ - lookupSelectArray[lookupListIndex] |= featureMask; - lookupOrderArray[store++] = lookupListIndex; - } -@@ -170,6 +177,8 @@ - lookupSelectArray[i] = 0; - } - -+ lookupSelectCount = lookupListCount; -+ - le_int32 count, order = 0; - le_int32 featureReferences = 0; - const FeatureTable *featureTable = NULL; diff --git a/icu/makefile.mk b/icu/makefile.mk index 82139b4..58b31e8 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -39,9 +39,6 @@ TARFILE_NAME=icu4c-49_1_1-src TARFILE_MD5=7c53f83e0327343f4060c0eb83842daf TARFILE_ROOTDIR=icu -#icu4c.8320.freeserif.crash.patch, see -#http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif - #icu4c.7601.Indic-ccmp.patch #http://bugs.icu-project.org/trac/ticket/7601 ccmp feature for Indic Languages @@ -51,7 +48,6 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-bsd.patch \ icu4c-build.patch \ - icu4c.8320.freeserif.crash.patch \ icu4c.8198.revert.icu5431.patch \ icu4c.7601.Indic-ccmp.patch \ icu4c-aix.patch \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
