[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                   |    8 +++-----
 patches/dev300/buildfix-sw-printf.diff |   20 --------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

New commits:
commit 9d0a8796715ed3759ea6ef186dace87d8994d44a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:33:10 2009 +0300

    buildfix-sw-printf.diff is not needed
    
    * patches/dev300/apply: Drop it.
    * patches/dev300/buildfix-sw-printf.diff: Not needed, the two files
      in question already include stdio.h now. Delete.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 094b406..dc2fb05 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -986,8 +986,6 @@ postset-add-ro.diff
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
 
-[ Gcc44 ]
-buildfix-sw-printf.diff, ccheney
 
 [ Java14 ]
 
diff --git a/patches/dev300/buildfix-sw-printf.diff b/patches/dev300/buildfix-sw-printf.diff
deleted file mode 100644
index 95d2ea6..0000000
--- a/patches/dev300/buildfix-sw-printf.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sw/source/core/doc/docbm.cxx	2009-05-01 08:09:45.000000000 -0500
-+++ sw/source/core/doc/docbm.cxx	2009-05-01 13:31:49.000000000 -0500
-@@ -33,6 +33,7 @@
- #include "precompiled_sw.hxx"
- 
- 
-+#include <stdio.h>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
---- sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-21 04:51:46.000000000 -0500
-+++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-01 15:20:53.000000000 -0500
-@@ -31,6 +31,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sw.hxx"
- 
-+#include <stdio.h>
- #include <iostream> 
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"
commit 6bbae6f59edff2408e7ab8435d9f85b7ea7d73a4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:30:37 2009 +0300

    transex3-localize-find.diff does not apply
    
    * patches/dev300/apply: transex3-localize-find.diff does not apply and
      probably is not needed. Move to UnUsedButNotYetRemovedFromGit.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f18031d..094b406 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -982,9 +982,6 @@ ucb-neon-0.24.diff, pmladek
 # add ro
 postset-add-ro.diff
 
-# localize fails with duplicated symlinks
-transex3-localize-find.diff, i#102296, pmladek
-
 # don't break dmake with environment variables containing space in the name
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
@@ -2265,6 +2262,9 @@ sc-speed-html-import.diff, i#100827, michael
 sc-speed-html-import-sizing.diff, i#100827, michael
 svx-speed-editeng.diff, i#100827, michael
 
+# localize fails with duplicated symlinks
+transex3-localize-find.diff, i#102296, pmladek
+
 
 [ Store ]
 SectionOwner => rodo