[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit fefc2d5e300ae5a750e6a70c07e6427dcab07191
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 14:09:14 2009 +0300

    Bypass more patches for now
    
    * patches/dev300/apply: Just bypass more patches, sigh.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7b7f2ce..8921379 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2309,7 +2309,7 @@ wmf-pattern-brush.diff, n#232232, rodo
 
 [ LayoutDialogs ]
 # use old style widgets as plugin in a layout dialog
-# FIXME: 2009-08-12: These seem to be upstream, more or less? --tml
+# FIXME: 2009-08-12: These seem to be upstream, more or less? --tmlx
 # layout-plugin-toolkit.diff
 # use one or more layout tabpages in old .src tabbed dialog
 # layout-tab-toolkit.diff
@@ -3009,23 +3009,34 @@ pptx-snapshot-at-ooxml03-creation.diff
 pptx-gfx-layout-fix.diff, thorsten
 
 # handles case where a connector shape is not connected
-pptx-fix-connector-crash.diff, n#499129, thorsten
+
+# FIXME: 2009-08-17: Upstream code has been restructured. --tml
+# pptx-fix-connector-crash.diff, n#499129, thorsten
 
 # For the purpose of the 3.1 release, all the pptx and xlsx are done as
 # separate libraries as well, so that we are safe wrt. the binary export
 # FIXME: Remove this patch (and update the other xlsx patches) after 3.1 is
 # branched
-xlsx-filter-as-a-separate-lib.diff
+# FIXME: 2009-08-17: OK, do as it says above then? --tml
+# xlsx-filter-as-a-separate-lib.diff
+
 [ OOXMLExport >= ooo310-m17 ]
 # update with the changes introduced up to m17
-xlsx-filter-as-a-separate-lib-m17-update.diff
+# FIXME: 2009-08-17: OK, do as it says above then? --tml
+# xlsx-filter-as-a-separate-lib-m17-update.diff
+
 [ OOXMLExport ]
 # tweak to above ( associated with vba-fallback-to-calling-doc-context.diff )
-xlsx-separate-lib-vba-fallback-tweak.diff
+
+# FIXME: 2009-08-17: Still more related. --tml
+# xlsx-separate-lib-vba-fallback-tweak.diff
+
 # Snapshot of the xlsx export filter at the time of creation of ooxml03
 # This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
 # should contain all the available changes.
-xlsx-snapshot.diff
+
+# FIXME: 2009-08-17: ooxml03 related, so bypass for now... --tml
+# xlsx-snapshot.diff
 
 # Make the xlsx export and import work at the same time
 # (converts the xlsx export to a UNO filter)