openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1729921 - in /openoffice/trunk/main/icu: icu-win-layoutex.patch makefile.mk
Date Thu, 11 Feb 2016 23:06:28 GMT
Author: damjan
Date: Thu Feb 11 23:06:27 2016
New Revision: 1729921

URL: http://svn.apache.org/viewvc?rev=1729921&view=rev
Log:
#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


Added:
    openoffice/trunk/main/icu/icu-win-layoutex.patch   (with props)
Modified:
    openoffice/trunk/main/icu/makefile.mk

Added: openoffice/trunk/main/icu/icu-win-layoutex.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icu/icu-win-layoutex.patch?rev=1729921&view=auto
==============================================================================
--- openoffice/trunk/main/icu/icu-win-layoutex.patch (added)
+++ openoffice/trunk/main/icu/icu-win-layoutex.patch Thu Feb 11 23:06:27 2016
@@ -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

Propchange: openoffice/trunk/main/icu/icu-win-layoutex.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openoffice/trunk/main/icu/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icu/makefile.mk?rev=1729921&r1=1729920&r2=1729921&view=diff
==============================================================================
--- openoffice/trunk/main/icu/makefile.mk (original)
+++ openoffice/trunk/main/icu/makefile.mk Thu Feb 11 23:06:27 2016
@@ -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=
 



Mime
View raw message