[ooo-build-commit] Branch 'ooo/OOO320' - zlib/zlib-1.1.4.patch

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Nov 20 18:36:06 PST 2009 

 zlib/zlib-1.1.4.patch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01fc4e650907f3eae99aa47c880b681f97c90e62
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Nov 20 13:56:43 2009 +0000

    CWS-TOOLING: integrate CWS tkr28
    2009-11-12 15:21:09 +0100 tkr  r277479 : #i105892# install ifilter for x64 and x86
    2009-11-11 07:39:36 +0100 tkr  r277439 : #105892# declare RegDeleteKeyExA  for mingw
    2009-11-11 07:38:38 +0100 tkr  r277438 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-10 10:43:56 +0100 tkr  r277422 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-10 08:41:11 +0100 tkr  r277419 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-10 08:38:52 +0100 tkr  r277418 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-10 08:31:09 +0100 tkr  r277417 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-09 10:08:42 +0100 tkr  r277403 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-06 14:10:13 +0100 tkr  r277386 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-06 14:08:29 +0100 tkr  r277384 : #105892# define KEY_WOW64_64KEY for mingw
    2009-11-06 12:09:12 +0100 tkr  r277381 : #105892# new BUILD_X64 variable for wntmsci12
    2009-11-03 14:44:33 +0100 mav  r277321 : #i106476# support 64-bit IE
    2009-11-03 11:53:01 +0100 mav  r277317 : #i106476# support 64-bit IE
    2009-11-03 11:50:31 +0100 mav  r277316 : #i106476# support 64-bit IE
    2009-11-03 10:09:46 +0100 mav  r277313 : #i106476# support 64-bit IE
    2009-11-02 22:21:20 +0100 mav  r277306 : #i106476# support 64-bit IE
    2009-11-02 21:33:49 +0100 mav  r277305 : #i106476# support 64-bit IE
    2009-11-02 13:39:18 +0100 tkr  r277296 : #105892# adjust customaction conditions
    2009-11-02 13:38:02 +0100 tkr  r277295 : #105892# fix reg64 customaction deinstallation
    2009-11-02 12:23:50 +0100 dv  r277292 : #i106129# cygwin uses case sensitive file names
    2009-11-02 08:49:04 +0100 tkr  r277287 : #105892# fix reg64 customaction
    2009-11-01 09:08:16 +0100 tkr  r277283 : #105892# build selected modules in x64 too
    2009-11-01 09:05:59 +0100 tkr  r277282 : #105892# add new registry entries for x64
    2009-11-01 09:04:50 +0100 tkr  r277281 : #105892# add new registry entries for x64
    2009-11-01 09:02:07 +0100 tkr  r277280 : #105892# add new *_x64 libs to instset
    2009-11-01 09:00:51 +0100 tkr  r277279 : #105892# add new BUILD_X64 variable
    2009-11-01 08:59:16 +0100 tkr  r277278 : #105892# add new reg64 customaction
    2009-11-01 08:56:23 +0100 tkr  r277277 : #105892# deliver new x64 libs to solver and made the  client name of the ooofiltproxy depends to x86/x64 builds
    2009-10-30 15:56:01 +0100 mav  r277276 : #i106476# support 64-bit IE
    2009-10-30 15:44:28 +0100 mav  r277275 : #i106476# support 64-bit IE
    2009-10-30 15:43:50 +0100 mav  r277274 : #i106476# support 64-bit IE
    2009-10-30 15:35:58 +0100 dv  r277273 : #i106129# we might need the VCRedist_x64.exe for 64 bit windows
    2009-10-30 13:37:59 +0100 mav  r277267 : #i106476# support 64-bit IE
    2009-10-30 12:51:50 +0100 mav  r277264 : #i106476# support 64-bit IE
    2009-10-30 12:48:15 +0100 mav  r277263 : #i106476# support 64-bit IE
    2009-10-29 15:54:41 +0100 dv  r277255 : #i106129# Don't use debug system libraries until we fully support x64 on windows
    2009-10-29 15:49:54 +0100 dv  r277254 : #i106129# Some changes to support 64Bit Windows
    2009-10-23 13:34:10 +0200 obo  r277159 : #i105892# Windows 64 Bit support
    2009-10-23 13:23:30 +0200 obo  r277153 : #i105892# Windows 64 Bit support SLO->SLO_X64
    2009-10-23 13:15:57 +0200 obo  r277147 : #i105892# Windows 64 Bit support
    2009-10-23 13:12:07 +0200 obo  r277145 : #i105892# Windows 64 Bit support
    2009-10-23 13:04:07 +0200 is  r277143 : #i105892# preparing 64 bit Windows registry table
    2009-10-23 10:27:58 +0200 is  r277133 : #i105892# support for 64 bit registry in scp2

diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch
index 34f2fdd..6b76c91 100644
--- a/zlib/zlib-1.1.4.patch
+++ b/zlib/zlib-1.1.4.patch
@@ -63,7 +63,7 @@
 +			$(SLO_X64)$/trees.obj		\
 +			$(SLO_X64)$/zutil.obj       \
 +			$(SLO_X64)$/unzip.obj		\
-+			$(SLO)$/ioapi.obj
++			$(SLO_X64)$/ioapi.obj
 +
 +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
 +LIB1OBJFILES_X64=$(SLOFILES_X64)

More information about the ooo-build-commit mailing list