patches/openoffice-scripting-mingw.patch @@ -133,10 +133,13 @@ Module 'automation' delivered successfully. 8 files copied, 12 files unchanged Module 'basctl' delivered successfully. 1 files copied, 17 files unchanged Module 'chart2' delivered successfully. 4 files copied, 8 files unchanged Module 'desktop' delivered successfully. 15 files copied, 85 files unchanged -Module 'extensions' delivered successfully. 39 files copied, 8 files unchanged -Module 'filter' delivered successfully. 119 files copied, 0 files unchanged -Module 'forms' delivered successfully. 5 files copied, 0 files unchanged -129 +Module 'extensions' delivered successfully. 12 files copied, 35 files unchanged +Module 'filter' delivered successfully. 9 files copied, 110 files unchanged +Module 'forms' delivered successfully. 1 files copied, 4 files unchanged +Module 'lingucomponent' delivered successfully. 12 files copied, 1 files unchanged +Module 'lotuswordpro' delivered successfully. 2 files copied, 0 files unchanged +Module 'reportdesign' delivered successfully. 29 files copied, 2 files unchanged +132 ''' class Openoffice (target.AutoBuild): @@ -248,7 +251,6 @@ ac_cv_icu_version_minor=${ac_cv_icu_version_minor=3.81} --disable-scsolver --disable-systray --disable-vba ---disable-vba --disable-xrender-link --disable-atl @@ -385,7 +387,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-dbaccess-mingw.patch', 'openoffice-desktop-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', 'openoffice-scripting-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, gub/specs/openoffice.py @@ -87,3 +87,34 @@ #include "path_helper.hxx" +--- sal/inc/sal/mathconf.h.~1.6.~ 2008-04-10 12:47:09.000000000 +0200 ++++ sal/inc/sal/mathconf.h 2008-04-10 12:47:24.000000000 +0200 +@@ -53,7 +53,7 @@ + problems, the SAL_MATH_FPEXCEPTIONS_OFF macro can be used to explicitly + switch off exceptions (on Windows). + */ +-#if defined WNT ++#if defined (WNT) && ! defined (__MINGW32__) + #define SAL_MATH_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) + #else /* WNT */ + #define SAL_MATH_FPEXCEPTIONS_OFF() +@@ -61,16 +61,16 @@ + + + /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */ +-#if defined( WNT) ++#if defined (WNT) && ! defined (__MINGW32__) + #define SAL_MATH_FINITE(d) _finite(d) + #elif defined OS2 + #define SAL_MATH_FINITE(x) \ + ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \ + : (sizeof (x) == sizeof (double)) ? __isfinite(x) \ + : __isfinitel(x)) +-#elif defined LINUX || defined UNX ++#elif defined LINUX || defined UNX || defined __MINGW32__ + #define SAL_MATH_FINITE(d) finite(d) +-#else /* WNT, LINUX, UNX */ ++#else /* WNT, LINUX, UNX, __MINGW32__ */ + #error "SAL_MATH_FINITE not defined" + #endif /* WNT, LINUX, UNX */ + patches/openoffice-sal-mingw.patch 551326418c09e99374e1bb6624357ecc4e4088d0 Jan Nieuwenhuizen janneke janneke@gnu.org http://github.com/janneke/gub/commit/3cb89dc60bbf4874a02aaeda886dae91d9821545 3cb89dc60bbf4874a02aaeda886dae91d9821545 2008-11-06T14:40:21-08:00 2008-11-06T14:40:21-08:00 OpenOffice: 132 modules, past reportdesign. 70673c25ea6a73cdbec853b0093fe36cf13129f2 Jan Nieuwenhuizen janneke janneke@gnu.org