[ooo-build-commit] Branch 'ooo-build-3-1-1' - 2 commits - patches/dev300

[Petr Mladek]

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

New commits:
commit 1d9fe4065cb39b5cd40a2268f9f1fc57667e62c8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Aug 26 12:04:59 2009 +0200

    Move SQLLEN unixodbc fix to FedoraLinuxOnlyFixes (i#104088)
    
    * patches/dev300/apply: move new-SQLLEN.diff to FedoraLinuxOnlyFixes; it breaks
      build on Windows; it is not really needed there; it is too late to provide
      proper fix for 3.1.1 rc1 release

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 93958e7..fee019f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -453,6 +453,7 @@ libxmlsec-findcerts.diff, i#76870, pmladek
 # avoid error messages about missing directories with templates
 sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 
+[ FedoraLinuxOnlyFixes ]
 # fix for new SQLLEN in unixodbc. Update internal headers.
 new-SQLLEN.diff, i#104088
 
commit f6d2fa1cd6901fe64598f5e49d8713f0e21c9e53
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Aug 26 11:59:42 2009 +0200

    Disabled ww8 image position import fix (bnc#532920)
    
    * patches/dev300/apply: disable ww8-image-position.diff; it needs more testing;
      update for Windows... => we do not want it in rc1 release

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5c513e0..93958e7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3192,7 +3192,7 @@ cws-ooxml03-enable-docx.diff
 
 # here because it patches a file added by cws-ooxml03-docx-sw.diff
 [ Fixes ]
-ww8-image-position.diff, n#532920, cbosdo
+#ww8-image-position.diff, n#532920, cbosdo
 
 
 [ CalcFixes ]