[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                              |    4 --
 patches/dev300/warning-return-values-stlport.diff |   30 ----------------------
 2 files changed, 34 deletions(-)

New commits:
commit 7f44c5f4e2682167ba07169a4a203152cdefcd79
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 16:25:55 2011 +0200

    bin obsolete warning-return-values-stlport.diff
    
    was workaround for a bug in gcc that has been fixed on 2005-08-19
    (gcc#20624)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ccdb48e..b01f078 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -144,10 +144,6 @@ makefile-idl-build.diff, noelpwer
 # (even bigger savings on 64bit, and with dicts like the Czech one)
 #FIXME oog680: hunspell-hashify.diff, i#50842, dkeskar/jholesov
 
-# 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
-
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
diff --git a/patches/dev300/warning-return-values-stlport.diff b/patches/dev300/warning-return-values-stlport.diff
deleted file mode 100644
index e6fd643..0000000
--- a/patches/dev300/warning-return-values-stlport.diff
+++ /dev/null
@@ -1,30 +0,0 @@
----
- stlport/STLport-4.5.patch |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git stlport/STLport-4.5.patch stlport/STLport-4.5.patch
-index 27ff2ef..f5a5b72 100644
---- stlport/STLport-4.5.patch
-+++ stlport/STLport-4.5.patch
-@@ -1024,6 +1024,18 @@
-  #ifndef _STLP_CMATH
-  #include <cmath>
-  #endif
-+*** misc/STLport-4.5/stlport/stl/_fstream.c	2001-07-06 06:16:17.000000000 +0200
-+--- misc/build/STLport-4.5/stlport/stl/_fstream.c	2007-06-01 10:57:07.000000000 +0200
-+***************
-+*** 379,384 ****
-+--- 379,385 ----
-+    }
-+    else
-+      return pos_type(-1);
-++   return pos_type(-1);
-+  }
-+
-+
- --- 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 @@
--- 
-1.7.0.1
-