icu/icu-win-layoutex.patch | 10 ++++++++++ icu/makefile.mk | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 2582d1371078e91155a13f1907089a1bb0c18365 Author: Damjan Jovanovic <[email protected]> Date: Thu Feb 11 23:06:27 2016 +0000 #i126840# - Windows/MSVC build often fails in main/icu The build script (used only on MSVC, not MingW or other OSes) for icu generates nmake makefiles for the build using icu's source/allinone/allinone.sln, in which layoutex doesn't list a dependency on i18n, despite linking to icuin.lib from i18n, which sporadically causes the icu build to fail. This is really an upstream bug, however upstream doesn't build using allinone.sln so we are affected more. This patch declares the missing dependecy, and makes icu build reliably. Patch by: me Tested by: pats diff --git a/icu/icu-win-layoutex.patch b/icu/icu-win-layoutex.patch new file mode 100644 index 0000000..44387fa --- /dev/null +++ b/icu/icu-win-layoutex.patch @@ -0,0 +1,10 @@ +--- misc/build/icu/source/allinone/allinone.sln 2009-01-15 09:46:06.000000000 +0200 ++++ misc/build/icu/source/allinone/allinone.sln 2016-02-11 01:00:15.492392000 +0200 +@@ -114,6 +114,7 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "layoutex", "..\layoutex\layoutex.vcproj", "{37FC2C7F-1904-4811-8955-2F478830EAD1}" + ProjectSection(ProjectDependencies) = postProject ++ {0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776} + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} + {C920062A-0647-4553-A3B2-37C58065664B} = {C920062A-0647-4553-A3B2-37C58065664B} + EndProjectSection diff --git a/icu/makefile.mk b/icu/makefile.mk index 09da718..7129c50 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -42,7 +42,7 @@ TARFILE_MD5= .ENDIF TARFILE_ROOTDIR=icu -PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch +PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch icu-win-layoutex.patch # ADDITIONAL_FILES= _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
