[ooo-build-commit] patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                              |    2 +-
 patches/dev300/warning-return-values-stlport.diff |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3bb5c3ea37a0deae954600b3f56d860ce25ce93c
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Oct 16 10:15:15 2009 +0200

    Update the STLPort warning patch to apply predictably.
    
    * patches/dev300/apply: Enable again.
    * patches/dev300/warning-return-values-stlport.diff: Update.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f95abd6..42a0428 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -247,7 +247,7 @@ sal-strintern-speed-fix.diff, i#78496, michael
 
 # temporary hack to avoid the warning about missing return values in gcc4
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
-#warning-return-values-stlport.diff, jholesov
+warning-return-values-stlport.diff, jholesov
 
 # Fix linkoo, the ultimate hacker tool
 fix-linkoo.diff, i#83548, jholesov
diff --git a/patches/dev300/warning-return-values-stlport.diff b/patches/dev300/warning-return-values-stlport.diff
index 9d1ba2f..de33f33 100644
--- a/patches/dev300/warning-return-values-stlport.diff
+++ b/patches/dev300/warning-return-values-stlport.diff
@@ -1,6 +1,6 @@
 --- stlport/STLport-4.5.patch	2007-03-26 16:20:10.000000000 +0200
 +++ stlport/STLport-4.5.patch	2007-06-01 10:58:51.000000000 +0200
-@@ -1068,3 +1068,15 @@
+@@ -1024,6 +1024,18 @@
    #ifndef _STLP_CMATH
    #include <cmath>
    #endif
@@ -16,3 +16,6 @@
 +  }
 +  
 +  
+ --- misc/STLport-4.5/stlport/stl/c_locale.h	2001-05-31 05:24:41.000000000 +0200
+ +++ misc/build/STLport-4.5/stlport/stl/c_locale.h	2008-07-18 14:14:05.000000000 +0200
+ @@ -167,6 +167,18 @@