To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=53572
------- Additional comments from [EMAIL PROTECTED] Fri Sep 8 20:37:28 -0700 2006 ------- @vg: I am going to supply the review results in cvs-diff but I found out that some suspicious patches are not applied to cws mingwport03 and wincvs does not emit unified or context diffs. If incremental patches and/or unified or context patches are preferable, please let me know. Please be notified that the diff for solenv/inc/libs.mk in update20060903.zip is incremental. 1) binfilter/legacysmgr/source/legacy/makefile.mk: cvs diff -r cws_src680_mingwport03 makefile.mk (in directory D:\OOo\Local\ooo_src680_m180\binfilter\legacysmgr\source\legacy) Index: makefile.mk =================================================================== RCS file: /cvs/framework/binfilter/legacysmgr/source/legacy/makefile.mk,v retrieving revision 1.5 diff -r1.5 makefile.mk 72a73,74 > .ELIF "$(GUI)$(COM)"=="WNTGCC" > SHL1VERSIONMAP=mingw_intel.map *****CVS exited normally with code 1***** Please create new file mingw_intel.map with the same contents as gcc3_linux_intel.map. 2) extensions/source/config/ldap/makefile.mk: The modifications are obsolete. Plese ignore them. 3) testtools/source/bridgetest/cli/makefile.mk: The modification is to skip everything completely because we ar not porting cli. 4) framework/util/makefile.mk: Probably kernel32 is not required as it is in STDSHL but I will include it to keep pure port. cvs diff -r cws_src680_mingwport03 makefile.mk (in directory D:\OOo\Local\ooo_src680_m180\framework\util\) Index: makefile.mk =================================================================== RCS file: /cvs/framework/framework/util/makefile.mk,v retrieving revision 1.106 diff -r1.106 makefile.mk 129,132c129,132 < uwinapi.lib \ < unicows.lib \ < advapi32.lib \ < kernel32.lib --- > $(UWINAPILIB) \ > $(UNICOWSLIB) \ > $(ADVAPI32LIB) \ > $(KERNEL32LIB) *****CVS exited normally with code 1***** 5) BROKEN_ALLOCA macro in bridges I might be better to use __MINGW32__ macro directly, but at least we should keep comment it is a workaround for broken alloca in gcc3 with sjlj exception handling as future port(OpenBSD?) may have to use it. 6) shell/source/win32/shlxthandler/makefile.mk, shell/source/win32/shlxthandler/ooofilt/makefile.mk: cvs diff -r cws_src680_mingwport03 makefile.mk (in directory D:\OOo\Local\ooo_src680_m180\shell\source\win32\shlxthandler\ooofilt\) Index: makefile.mk =================================================================== RCS file: /cvs/gsl/shell/source/win32/shlxthandler/ooofilt/makefile.mk,v retrieving revision 1.4 diff -r1.4 makefile.mk 56,57d55 < $(SLO)$/utilities.obj\ < $(SLO)$/dbgmacros.obj\ 58a57,61 > > .IF "$(COM)"!="GCC" > SLOFILES+=$(SLO)$/utilities.obj\ > $(SLO)$/dbgmacros.obj > .ENDIF 61,67c64,77 < SHL1STDLIBS=ole32.lib\ < advapi32.lib\ < comctl32.lib\ < uuid.lib\ < shell32.lib\ < kernel32.lib\ < OldNames.Lib --- > .IF "$(COM)"=="GCC" > SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) > SHL1LIBS= > .ELSE > SHL1STDLIBS= > SHL1LIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) > .ENDIF > SHL1STDLIBS+=$(OLE32LIB)\ > $(ADVAPI32LIB)\ > $(COMCTL32LIB)\ > $(UUIDLIB)\ > $(SHELL32LIB)\ > $(KERNEL32LIB)\ > $(OLDNAMESLIB) 69,72c79 < SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ < $(SOLARLIBDIR)$/expat_xmlparse.lib\ < $(SOLARLIBDIR)$/expat_xmltok.lib\ < $(SLB)$/util.lib\ --- > SHL1LIBS+=$(SLB)$/util.lib\ *****CVS exited normally with code 1***** cvs diff -r cws_src680_mingwport03 makefile.mk (in directory D:\OOo\Local\ooo_src680_m180\shell\source\win32\shlxthandler\) Index: makefile.mk =================================================================== RCS file: /cvs/gsl/shell/source/win32/shlxthandler/makefile.mk,v retrieving revision 1.8 diff -r1.8 makefile.mk 64,77c64,82 < SHL1STDLIBS=uwinapi.lib\ < oleaut32.lib\ < advapi32.lib\ < ole32.lib\ < uuid.lib\ < shell32.lib\ < kernel32.lib\ < gdi32.lib\ < gdiplus.lib < < SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ < $(SOLARLIBDIR)$/expat_xmlparse.lib\ < $(SOLARLIBDIR)$/expat_xmltok.lib\ < $(SLB)$/util.lib\ --- > .IF "$(COM)"=="GCC" > SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) > SHL1LIBS= > .ELSE > SHL1STDLIBS= > SHL1LIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) > .ENDIF > SHL1STDLIBS+=$(UWINAPILIB)\ > $(OLEAUT32LIB)\ > $(ADVAPI32LIB)\ > $(OLE32LIB)\ > $(UUIDLIB)\ > $(SHELL32LIB)\ > $(KERNEL32LIB)\ > $(GDI32LIB)\ > $(COMCTL32LIB)\ > $(GDIPLUSLIB) > > SHL1LIBS+=$(SLB)$/util.lib\ *****CVS exited normally with code 1***** 7) scp2/source/ooo/file_library_ooo.scp: libdb_cxx42.dll: The modification is obsolete. cvs diff -r cws_src680_mingwport03 file_library_ooo.scp (in directory D:\OOo\Local\ooo_src680_m180\scp2\source\ooo\) Index: file_library_ooo.scp =================================================================== RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v retrieving revision 1.206 diff -r1.206 file_library_ooo.scp 509a510,512 > #ifdef _gcc3 > Name = "libcurl-3.dll"; > #else 510a514 > #endif 865c869 < #if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined (SYSTEM_STDLIBS)) --- > #if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined (SYSTEM_STDLIBS) || defined(WNT)) 879c883 < #if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined (SYSTEM_STDLIBS)) --- > #if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined (SYSTEM_STDLIBS) || defined(WNT)) 982a987,989 > #ifdef _gcc3 > Name = STRING(CONCAT6(libicudata,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO,.dll)); > #else 983a991 > #endif 993a1002,1004 > #ifdef _gcc3 > Name = STRING(CONCAT6(libicui18n,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO,.dll)); > #else 994a1006 > #endif 1004a1017,1019 > #ifdef _gcc3 > Name = STRING(CONCAT6(libicule,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO,.dll)); > #else 1005a1021 > #endif 1015a1032,1034 > #ifdef _gcc3 > Name = STRING(CONCAT6(libicuuc,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO,.dll)); > #else 1016a1036 > #endif 1353a1374,1384 > #if defined(_gcc3) > > File GID_FILE_LIB_MINGWM10 > BIN_FILE_BODY; > Styles = (PACKED, SETUPZIP); > Dir = gid_Dir_Program; > Name = "mingwm10.dll"; > End > > #endif > 1477c1508 < #ifdef WNT --- > #if defined(WNT) && !defined(_gcc3) 1551a1583,1588 > #if defined(WNT) && defined(_gcc3) > > STD_SETUPZIP_LIB_FILE( GID_FILE_LIB_PSP, psp ) > > #endif > 1947a1985,1987 > #if defined(_gcc3) > Name = STRING(CONCAT3(libstlport_,gcc,.dll)); > #else 1948a1989 > #endif 2307a2349,2351 > #ifdef _gcc3 > Name = "libxml2-2.dll"; > #else 2308a2353 > #endif 2397a2443,2445 > #ifdef _gcc3 > Name = "libxmlsec1-1.dll"; > #else 2398a2447 > #endif 2406a2456,2458 > #ifdef _gcc3 > Name = "libxmlsec1-mscrypto-1.dll"; > #else 2407a2460 > #endif *****CVS exited normally with code 1***** 8) desktop/win32/source/setup/makefile.mk: As mingw does not distribute static library of C runtimes, we can only rely on installed msvcrt. 9) basic/source/app/makefile.mk: EXCEPTIONSFILES should include $(OBJ)$/process.obj for wnt and only for wnt, including MSVC build. Actually MSVC build is getting a warning here for missing -GX. It is a bug fix and not a pure port. Please ignore it. 10) chart2/source/view/makefile.mk, chart2/source/tools/makefile.mk: "DEFLIB1NAME= $(TARGET)" is required only for mingw to export symbols to be refered from other chart2 dynamic link libraries. MSVC build is using static link but I think it better to use dynamic link as other gcc platforms do and not to build static library. 11) ucb/source/ucp/webdav/makefile.mk: cvs diff -r cws_src680_mingwport03 makefile.mk (in directory D:\OOo\Local\ooo_src680_m180\ucb\source\ucp\webdav\) Index: makefile.mk =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/makefile.mk,v retrieving revision 1.29 diff -r1.29 makefile.mk 128c128 < SHL1STDLIBS+= wsock32.lib --- > SHL1STDLIBS+= $(WSOCK32LIB) *****CVS exited normally with code 1***** --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
