patches/openoffice-dbaccess-mingw.patch patches/openoffice-desktop-mingw.patch @@ -126,9 +126,12 @@ Module 'basic' delivered successfully. 7 files copied, 45 files unchanged Module 'sfx2' delivered successfully. 4 files copied, 119 files unchanged Module 'avmedia' delivered successfully. 2 files copied, 9 files unchanged Module 'linguistic' delivered successfully. 2 files copied, 11 files unchanged -Module 'svx' delivered successfully. 640 files copied, 2 files unchanged - -120 modules +Module 'svx' delivered successfully. 5 files copied, 637 files unchanged +Module 'dbaccess' delivered successfully. 69 files copied, 1 files unchanged +Module 'automation' delivered successfully. 18 files copied, 2 files unchanged +Module 'basctl' delivered successfully. 17 files copied, 1 files unchanged +Module 'chart2' delivered successfully. 12 files copied, 0 files unchanged +124 ''' class Openoffice (target.AutoBuild): @@ -377,7 +380,7 @@ LD_LIBRARY_PATH=%(LD_LIBRARY_PATH)s ##CPPFLAGS= class Openoffice__mingw (Openoffice): - Openoffice.upstream_patches += ['openoffice-config_office-mingw.patch', 'openoffice-solenv-mingw.patch', 'openoffice-sal-mingw.patch', 'openoffice-external-mingwheaders.patch', 'openoffice-cppunit-mingw.patch', 'openoffice-i18npool-mingw.patch', 'openoffice-tools-mingw.patch', 'openoffice-setup_native-mingw.patch', 'openoffice-pyuno-mingw.patch', 'openoffice-sysui-mingw.patch', 'openoffice-dtrans-mingw.patch', 'openoffice-fpicker-mingw.patch', 'openoffice-sccomp-mingw.patch', 'openoffice-vcl-mingw.patch', 'openoffice-connectivity-mingw.patch', 'openoffice-unotools-mingw.patch', 'openoffice-embeddedobj-mingw.patch', 'openoffice-shell-mingw.patch', 'openoffice-svx-mingw.patch'] + Openoffice.upstream_patches += ['openoffice-config_office-mingw.patch', 'openoffice-solenv-mingw.patch', 'openoffice-sal-mingw.patch', 'openoffice-external-mingwheaders.patch', 'openoffice-cppunit-mingw.patch', 'openoffice-i18npool-mingw.patch', 'openoffice-tools-mingw.patch', 'openoffice-setup_native-mingw.patch', 'openoffice-pyuno-mingw.patch', 'openoffice-sysui-mingw.patch', 'openoffice-dtrans-mingw.patch', 'openoffice-fpicker-mingw.patch', 'openoffice-sccomp-mingw.patch', 'openoffice-vcl-mingw.patch', 'openoffice-connectivity-mingw.patch', 'openoffice-unotools-mingw.patch', 'openoffice-embeddedobj-mingw.patch', 'openoffice-shell-mingw.patch', 'openoffice-svx-mingw.patch', 'openoffice-dbaccess-mingw.patch', 'openoffice-desktop-mingw.patch'] # external/mingwheaders seems a badly misguided effort. It # patches header files and is thus strictly tied to a gcc version; # that can never build. How can patching header files ever work, @@ -411,7 +414,7 @@ class Openoffice__mingw (Openoffice): + ' --disable-xrender-link' + ' --with-distro=Win32') def patch_upstream (self): - self.system ('chmod -R ugo+w %(upstream_dir)s/dtrans %(upstream_dir)s/fpicker') + self.system ('chmod -R ugo+w %(upstream_dir)s/dtrans %(upstream_dir)s/fpicker %(upstream_dir)s/dbaccess') Openoffice.patch_upstream (self) # avoid juggling of names for windows-nt self.system ('sed -i -e "s@WINNT@WNT@" %(upstream_dir)s/config_office/configure.in') gub/specs/openoffice.py @@ -21,7 +21,7 @@ # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -@@ -50,7 +54,10 @@ CXX*=gcc +@@ -50,7 +54,12 @@ CXX*=gcc #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) # new: #CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /) @@ -29,7 +29,9 @@ +CFLAGS=-fmessage-length=0 -c -fpcc-struct-return $(OLE2DEF) +.IF "$(CROSS_COMPILING)" == "no" +CFLAGS += -nostdinc -+.ENDIF # "$(CROSS_COMPILING)" == "no" ++.ELSE # "$(CROSS_COMPILING)" == "yes" ++CFLAGS += -D__CROSS__ ++.ENDIF # "$(CROSS_COMPILING)" == "yes" ### CFLAGSCC=-pipe $(ARCH_FLAGS) CFLAGSCXX=-pipe $(ARCH_FLAGS) @@ -108,7 +110,7 @@ +.IF "$(CROSS_COMPILING)" == "no" RC=rc +.ELSE # "$(CROSS_COMPILING)" == "yes" -+RC=wrc --nostdinc -I $(COMPATH)/../../include -DCROSS_COMPILING=1 ++RC=wrc --nostdinc -I $(COMPATH)/../../include -I/ -DCROSS_COMPILING=1 +.ENDIF # "$(CROSS_COMPILING)" == "yes" RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES) RCLINK= @@ -135,7 +137,7 @@ WINSPOOLLIB=-lwinspool IMM32LIB=-limm32 PSPLIB=-lpsp -@@ -189,14 +228,18 @@ USER32LIB=-luser32 +@@ -189,14 +228,21 @@ USER32LIB=-luser32 LIBCMT=-lmsvcrt COMDLG32LIB=-lcomdlg32 COMCTL32LIB=-lcomctl32 @@ -162,6 +164,9 @@ + +.IF "$(CROSS_COMPILING)" == "yes" +CURLLIB=-lcurl ++BERKELEYLIB=-ldb -lwsock32 ++XSLTLIB=-lxslt -lxml2 ++LIBXML2LIB=-lxml2 +.ENDIF --- solenv/inc/shlinfo.rc.pristine 2008-10-29 09:33:25.000000000 +0100 +++ solenv/inc/shlinfo.rc 2008-10-29 09:33:33.000000000 +0100 patches/openoffice-solenv-mingw.patch @@ -21,8 +21,19 @@ compatible. The strsafe functions return an error code and the standard C functions return a character count */ #define StringCchVPrintfA vsnprintf - #define StringCchPrintfA snprintf + #define StringCchVPrintfW vsnprintf + #define StringCchVPrintf vsnprintf + #define StringCchPrintfA(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__) + #define StringCchPrintfW(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__) + #define StringCchPrintf(str, n, format, ...) snprintf ((char*)str, n, (char const*)format, __VA_ARGS__) + + #define StringCchCopy(dest, n, src) strncpy ((char*)dest, (char const*)src, n) + #define StringCchCopyN(dest, n1, src, n2) strncpy ((char*)dest, (char const*)src, min (n1, n2)) + #define StringCchCat(dest, n, src) strncat ((char*)dest, (char const*)src, n) + + #define STRSAFE_MAX_CCH 0x7FFFFFFF + #define _stricmp strcasecmp #define _strnicmp strncasecmp #endif sourcefiles/mingw-headers/strsafe.h 8931e7839bffb2745f08ff56f1bc3d43b82da690 Jan Nieuwenhuizen janneke@gnu.org http://github.com/janneke/gub/commit/76e5823756ea1eda37542808a82d784df4a20ee2 76e5823756ea1eda37542808a82d784df4a20ee2 2008-11-05T06:56:33-08:00 2008-11-05T06:56:33-08:00 OpenOffice: 124 modules, past dbaccess. 3de590ad5f602b4b2940a711ae079496b8cf03db Jan Nieuwenhuizen janneke@gnu.org