[ooo-build-commit] .: patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Mon Feb 1 09:16:16 PST 2010


 patches/dev300/apply |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b7239facb7345420e211096cd67b18bc935f0606
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Feb 1 19:09:45 2010 +0200

    Move win32-gw-send-mail.diff from Win32Only to NovellOnly
    
    The patch mail-document-subject.diff which is NovellOnly now depends
    on win32-gw-send-mail.diff, so put them both in the same
    set. Otherwise patch.apply fails on Linux. win32-gw-send-mail.diff
    affects only Win32 code, so it doesn't hurt to use it on Unix, too.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e7c41e1..822eab8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1528,10 +1528,13 @@ warning-return-values-lotuswordpro.diff, pmladek
 
 # 2 more makefiles in sysui are seriously broken #35628
 # parallel-python-makefile_mk.diff # looks to be upstream
+
+[ NovellOnly ]
 # Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
 # Also fix OOo/GW deadlock
 win32-gw-send-mail.diff, i#34264, n#418407, tml
 
+[ Win32Only ]
 # This is a pretty nasty IE problem i#19510, i#65209
 # FIXME: 2009-10-26: Let's assume the problem is gone for now.
 # And actually afaics embedding doesn't work anyway, even


More information about the ooo-build-commit mailing list