patches/openoffice-goodies-mingw.patch @@ -398,7 +398,7 @@ cd %(builddir)s/build/%(cvs_tag)s && patch -p%(patch_strip_component)s < %(patch self.file_sub ([('(^[^#].*[ \t](all|n|w|w,vc[0-9])[ \t])', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) module = 'setup_native' - self.file_sub ([('([^#].*customactions.*)', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) + self.file_sub ([('^(pk.*customactions.*)', r'#\1')], '%(upstream_dir)s/%(module)s/prj/build.lst', env=locals ()) # uses oledb.h from psdk module = 'connectivity' gub/specs/openoffice.py @@ -1,16 +1,14 @@ ---- dbaccess/source/ui/dlg/makefile.mk.~1~ 2008-11-04 20:34:29.000000000 +0100 -+++ dbaccess/source/ui/dlg/makefile.mk 2008-11-05 10:01:44.000000000 +0100 -@@ -133,7 +133,9 @@ SLOFILES= \ +--- dbaccess/source/ui/dlg/makefile.mk.pristine 2008-04-10 16:59:00.000000000 +0200 ++++ dbaccess/source/ui/dlg/makefile.mk 2009-02-16 15:51:44.000000000 +0100 +@@ -131,7 +131,7 @@ SLOFILES= \ + $(SLO)$/dlgsize.obj \ + $(SLO)$/dlgattr.obj - .IF ("$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="") || "$(CROSS_COMPILING)" == "yes" +-.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" ++.IF ("$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="") || "$(TARGET_OS)" == "MinGW" DISABLE_ADO=TRUE --.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" -+.ELSE -+CFLAGS += -D_ADO_DATALINK_BROWSE_ -+.ENDIF + .ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" - .IF "$(GUI)"=="WNT" && "$(DISABLE_ADO)"=="" - SLOFILES+= $(SLO)$/adodatalinks.obj --- dbaccess/source/ui/dlg/odbcconfig.cxx.~2~ 2008-11-05 10:14:38.000000000 +0100 +++ dbaccess/source/ui/dlg/odbcconfig.cxx 2008-11-04 17:22:07.000000000 +0100 @@ -31,6 +31,15 @@ @@ -39,3 +37,14 @@ #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> #endif +--- dbaccess/source/ui/dlg/ConnectionHelper.cxx.~1.19.~ 2008-05-05 17:56:49.000000000 +0200 ++++ dbaccess/source/ui/dlg/ConnectionHelper.cxx 2009-02-16 21:37:10.000000000 +0100 +@@ -149,7 +149,7 @@ + #ifndef _SFX_DOCFILT_HACK_HXX + #include <sfx2/docfilt.hxx> + #endif +-#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT)) ++#if !defined(WINDOWS_VISTA_PSDK) && !defined(__MINGW32__) && (defined(WIN) || defined(WNT)) + #define _ADO_DATALINK_BROWSE_ + #endif + patches/openoffice-dbaccess-mingw.patch @@ -11,3 +11,14 @@ #include <stdio.h> +--- svx/source/engine3d/scene3d.cxx.pristine 2009-02-16 10:47:03.000000000 +0100 ++++ svx/source/engine3d/scene3d.cxx 2009-02-16 10:45:14.000000000 +0100 +@@ -260,7 +260,7 @@ void E3dScene::SetDefaultAttributes(E3dD + #endif + + // Fuer WIN95/NT die FP-Exceptions abschalten +-#if defined(WNT) || defined(WIN) ++#if (defined(WNT) || defined(WIN)) && !defined (__MINGW32__) + #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) + #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) + SC_FPEXCEPTIONS_OFF(); patches/openoffice-svx-mingw.patch @@ -315,48 +315,6 @@ if( !nScreenDX || !nScreenDY ) { nScreenDX = GetSystemMetrics( SM_CXSCREEN ); -@@ -3179,6 +3182,41 @@ SalFrame::SalPointerState WinSalFrame::G - - // ----------------------------------------------------------------------- - -+SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState() -+{ -+ SalIndicatorState aState; -+ aState.mnState = 0; -+ if (::GetKeyState(VK_CAPITAL)) -+ aState.mnState |= INDICATOR_CAPSLOCK; -+ -+ if (::GetKeyState(VK_NUMLOCK)) -+ aState.mnState |= INDICATOR_NUMLOCK; -+ -+ if (::GetKeyState(VK_SCROLL)) -+ aState.mnState |= INDICATOR_SCROLLLOCK; -+ -+ return aState; -+} -+ -+void WinSalFrame::SimulateKeyPress( USHORT nKeyCode ) -+{ -+ BYTE nVKey = 0; -+ switch (nKeyCode) -+ { -+ case KEY_CAPSLOCK: -+ nVKey = VK_CAPITAL; -+ break; -+ } -+ -+ if (nVKey > 0 && nVKey < 255) -+ { -+ ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY, 0); -+ ::keybd_event(nVKey, 0x45, KEYEVENTF_EXTENDEDKEY|KEYEVENTF_KEYUP, 0); -+ } -+} -+ -+// ----------------------------------------------------------------------- -+ - void WinSalFrame::SetBackgroundBitmap( SalBitmap* ) - { - } @@ -5592,6 +5630,7 @@ static BOOL ImplHandleIMEEndComposition( static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { patches/openoffice-vcl-mingw.patch fd5fcd508842de5ee899f6a219540f9ee2fdfad9 Jan Nieuwenhuizen janneke janneke@gnu.org http://github.com/janneke/gub/commit/fe9c3dcf1b6f89c498c60cec2de4b0522c076022 fe9c3dcf1b6f89c498c60cec2de4b0522c076022 2009-02-18T06:17:17-08:00 2009-02-18T06:17:17-08:00 OpenOffice: Add missing fixes for fresh build. It now reaches ************************************************** ERROR: ERROR: Could not register all components for file services.rdb (gid_Starregistry_Services_Rdb)! in function: create_services_rdb ************************************************** ************************************************** ERROR: Saved logfile: /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/instsetoo_native/util/OpenOffice//logging/en-US/log_OOO300_en-US.log ************************************************** ... cleaning the output tree ... ... removing directory /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/instsetoo_native/util/OpenOffice//zip/en-US ... ... removing directory /home/janneke/vc/gub/target/mingw/build/openoffice-trunk/build/ooo300-m9/instsetoo_native/util/OpenOffice//gid_Starregistry_Services_Rdb_servicesrdb/en-US_witherror_1 ... Tue Feb 17 18:03:15 2009 (01:09 min.) Failed to install: at ./ooinstall line 143. make: *** [install] Error 1 ad424f5f89630307a983b5b15e46a100765c107a Jan Nieuwenhuizen janneke janneke@gnu.org