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

[Jan Holesovsky]

 patches/dev300/apply |   42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

New commits:
commit 964cc3ba65c7e49b9503d10b3e04793ca482003d
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Mar 29 18:05:47 2010 +0200

    Partial fix of the m12 build; still not finished.
    
    * patches/dev300/apply: Add many < ooo320-m14, and >= ooo320-m14.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0139632..443f6de 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -399,22 +399,26 @@ offapi-typecheck-whitelist.diff, thorsten
 reportdesigner-no-license-m13.diff
 presenterscreen-no-license-m13.diff
 presentation-minimizer-no-license-m13.diff
-wiki-publisher-no-license-m13.diff
 pdfimport-no-license-m13.diff
 
 [ ExtensionFixes >= ooo320-m14 ]
 reportdesigner-no-license.diff
 presenterscreen-no-license.diff
 presentation-minimizer-no-license.diff
-wiki-publisher-no-license.diff
 pdfimport-no-license.diff
 
 [ ExtensionFixes ]
+wiki-publisher-no-license.diff
+
 # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
 apache-commons-build-fix-invalid-chars.diff, kami
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
 
+[ ExtensionFixes < ooo320-m14 ]
+# Fix from Andre, allows to step back one animation effect
+slideshow-effect-rewind-sdext-m13.diff, i#48179, thorsten
+[ ExtensionFixes >= ooo320-m14 ]
 # Fix from Andre, allows to step back one animation effect
 slideshow-effect-rewind-sdext.diff, i#48179, thorsten
 
@@ -640,8 +644,12 @@ gnome-vfs-late-init.diff, i#84137, jholesov
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
 
+[ QuickStarter < ooo320-m14 ]
+unxsplash-rework-m13.diff, i#60696, michael/jholesov
+[ QuickStarter >= ooo320-m14 ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
+[ QuickStarter ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
@@ -990,10 +998,16 @@ calc-xls-export-row-height-wrapped-text.diff, n#580094, kohei
 # fix for print selected cells functionality.
 calc-print-selected-cells-fix.diff, n#569328, i#109386, kohei
 
-[ LinuxOnly ]
+[ LinuxOnly < ooo320-m14 ]
+# accelerate linking, by extreme cunning i#63927
+# this is an increasingly marginal win ...
+speed-local-link-except-m13.diff, i#63927, michael
+[ LinuxOnly >= ooo320-m14 ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...
 speed-local-link-except.diff, i#63927, michael
+
+[ LinuxOnly ]
 # the file this one patches ends with CR chars... :-(
 speed-local-link-except-offuh.diff
 
@@ -1316,9 +1330,14 @@ recovery-report.diff, i#53531, martink
 # Controversial bits - no use filing up-stream
 #
 
+[ Defaults < ooo320-m14 ]
+# automatically do any migration we can, with no wizard
+default-no-startup-wizard-m13.diff, michael
+[ Defaults >= ooo320-m14 ]
 # automatically do any migration we can, with no wizard
 default-no-startup-wizard.diff, michael
 
+[ Defaults ]
 # don't throw up the style dialog on 1st run
 default-no-style-dialog.diff, michael
 
@@ -2184,8 +2203,12 @@ writerfilter-module-writer.diff
 writerfilter-source-dmapper-domainmapper-debug.diff
 docx-fixes01.diff, cbosdo
 docx-vml-import.diff, cbosdo
+[ OOXML < ooo320-m14 ]
+writerfilter-docx-numbering-m13.diff, n#536407, cbosdo
+[ OOXML >= ooo320-m14 ]
 writerfilter-docx-numbering.diff, n#536407, cbosdo
 
+[ OOXML ]
 # Ugly temporary fix
 docx-ugly-fix.diff, n#548701, cbosdo
 
@@ -2551,7 +2574,11 @@ wmf-pattern-brush.diff, n#232232, rodo
 
 # FIXME: these bits are part of layoutdialogs2 -- some things got
 # removed upstream, apparently.
+[ LayoutDialogs < ooo320-m14 ]
+layout-post-cws-layoutdialogs2-mysteriously-missing-m13.diff
+[ LayoutDialogs >= ooo320-m14 ]
 layout-post-cws-layoutdialogs2-mysteriously-missing.diff
+[ LayoutDialogs ]
 layout-post-cws-layoutdialogs2-edit-noop-reversal.diff, n#552450
 
 layout-localize-fix-sc.diff
@@ -3216,10 +3243,14 @@ pptx-filter-as-a-separate-lib-sd-build-lst-without-transogl.diff
 [ OOXMLExport and OpenGLTransitions ]
 pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
 
-[ OOXMLExport ]
+[ OOXMLExport < ooo320-m14 ]
+# Enable the DOCX export (and few related features in oox)
+docx-export-enable-m13.diff, jholesov
+[ OOXMLExport >= ooo320-m14 ]
 # Enable the DOCX export (and few related features in oox)
 docx-export-enable.diff, jholesov
 
+[ OOXMLExport ]
 # Snapshot of the pptx export filter at the time of creation of ooxml03
 # This is until 0475--fix-crash-introduced-by-Jonathan-s-changes-in-eppt.patch
 # (including)
@@ -3289,6 +3320,9 @@ xlsx-export-perf-rowbuffer.diff, n#558577, kohei
 # hack to ignore writerfilter when odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 
+[ OOXMLExport < ooo320-m14 ]
+oox-smartart-import-m13.diff, thorsten
+[ OOXMLExport >= ooo320-m14 ]
 oox-smartart-import.diff, thorsten
 
 [ OOXML ]