[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f9960c39f69df2805c52baa301535d5f5d1cde8b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 1 17:02:42 2009 -0400

    Disabled patches to get sw to build on dev300-m60.
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 39e785f..e1c7973 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -602,9 +602,12 @@ unxsplash-3layer.diff, i#60696, jholesov
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
-[ WriterFixes ]
+[ WriterFixes < dev300-m60 ]
 # Allows to copy/paste html text which is between 2 unknown tags.
+# FIXME: This one applies, but doesn't build in dev300-m60.
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
+
+[ WriterFixes ]
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
 
@@ -2868,7 +2871,8 @@ setup_native-package-glib2.diff
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 
 [ Fixes >= dev300-m60 ]
-sw-section-import-fix.diff, n#364533, freuter
+# FIXME: 2009-10-01: This one applies, but doesn't build on dev300-m60.
+# sw-section-import-fix.diff, n#364533, freuter
 
 [ Fixes < dev300-m60 ]
 sw-section-import-fix-m58.diff, n#364533, freuter