[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 0928e46c45a283f7119f7f2640bc52d7d3edfd67
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 14:03:46 2009 +0300

    Bypass some OOXMLExport patches
    
    * patches/dev300/apply: Bypass pptx-the-rest-from-git.diff and
      pptx-export-empty-animations-node-and-groupshape-fix.diff for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4d3ba60..7b7f2ce 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2999,8 +2999,11 @@ pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
 pptx-snapshot-at-ooxml03-creation.diff
 # ...and the rest from the git tree
 # (until 'more qnimations export work', including)
-pptx-the-rest-from-git.diff
-pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
+
+# FIXME: 2009-08-17: Does not apply. Upstream source has
+# been restructured. --tml
+# pptx-the-rest-from-git.diff
+# pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
 
 # ugly temp fix to make GraphicShapeContext recognise layout
 pptx-gfx-layout-fix.diff, thorsten