[ooo-build-commit] patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Thu Oct 1 06:06:18 PDT 2009


 patches/dev300/apply                     |    3 --
 patches/dev300/stlport-gcc-warnings.diff |   34 -------------------------------
 2 files changed, 37 deletions(-)

New commits:
commit a3863df201a1df08469d277f6e3241a3ee7dfa61
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 1 15:05:31 2009 +0200

    stlport-gcc-warnings.diff already in dev300-m46 (i#100223)
    
    * patches/dev300/stlport-gcc-warnings.diff:
    * patches/dev300/apply: bin; already in dev300-m46 (i#100223)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a7a50c0..bf27bba 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1332,9 +1332,6 @@ sdk-gid-module-name.diff, pmladek, i#64802
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
-# GCC warnings: suggest a space before '; ' or explicit braces around empty body in 'for' statement
-stlport-gcc-warnings.diff, i#100223, gokcen
-
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
diff --git a/patches/dev300/stlport-gcc-warnings.diff b/patches/dev300/stlport-gcc-warnings.diff
deleted file mode 100644
index e181139..0000000
--- a/patches/dev300/stlport-gcc-warnings.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- stlport/STLport-4.5-0119.patch.old	2009-02-20 21:44:17.000000000 +0100
-+++ stlport/STLport-4.5-0119.patch	2009-03-16 19:58:59.000000000 +0100
-@@ -1326,3 +1326,14 @@
-  
-    explicit _DBG_vector(size_type __n)
-      : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
-+--- misc/STLport-4.5-0119/stlport/stl/_list.c	2001-05-11 04:20:07.000000000 +0200
-++++ misc/build/STLport-4.5-0119/stlport/stl/_list.c	2009-03-16 19:53:28.000000000 +0100
-+@@ -82,7 +82,7 @@ void list<_Tp, _Alloc>::resize(size_type
-+ {
-+   iterator __i = begin();
-+   size_type __len = 0;
-+-  for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
-++  for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
-+ 
-+   if (__len == __new_size)
-+     erase(__i, end());
---- stlport/STLport-4.5.patch.old	2009-02-20 21:44:17.000000000 +0100
-+++ stlport/STLport-4.5.patch	2009-03-16 19:54:57.000000000 +0100
-@@ -1045,3 +1045,14 @@
-  # elif defined (__FreeBSD__)
-  
-  # define _Locale_CNTRL _CTYPE_C
-+--- misc/STLport-4.5/stlport/stl/_list.c	2001-05-11 04:20:07.000000000 +0200
-++++ misc/build/STLport-4.5/stlport/stl/_list.c	2009-03-16 19:53:28.000000000 +0100
-+@@ -82,7 +82,7 @@ void list<_Tp, _Alloc>::resize(size_type
-+ {
-+   iterator __i = begin();
-+   size_type __len = 0;
-+-  for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
-++  for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
-+ 
-+   if (__len == __new_size)
-+     erase(__i, end());


More information about the ooo-build-commit mailing list