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

[René Engelhard]

 patches/dev300/vcl-system-graphite-with-stlport.diff |   24 ++-----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 68af977580075dfc6cfd543ad0b0d02e8b4244cf
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 4 21:51:30 2010 +0100

    fix applying of vcl-system-graphite-with-stlport.diff
    
    * patches/dev300/vcl-system-graphite-with-stlport.diff: merge two preraphitestlk.h hunks

diff --git a/patches/dev300/vcl-system-graphite-with-stlport.diff b/patches/dev300/vcl-system-graphite-with-stlport.diff
index 6247612..4f9536f 100644
--- a/patches/dev300/vcl-system-graphite-with-stlport.diff
+++ b/patches/dev300/vcl-system-graphite-with-stlport.diff
@@ -284,7 +284,9 @@ diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
 +#   undef _STLP_MAP
 +#   define _STLP_DONT_REDEFINE_STD 1
 +#   define _STLP_WHOLE_NATIVE_STD 1
++#   pragma GCC visibility push(default)
 +#   include _STLP_NATIVE_HEADER(exception_defines.h)
++#   include _STLP_NATIVE_HEADER(limits)
 +#   include _STLP_NATIVE_HEADER(memory)
 +#   include _STLP_NATIVE_HEADER(exception)
 +#   include _STLP_NATIVE_HEADER(iosfwd)
@@ -296,27 +298,7 @@ diff -r db9687bbeaf0 -r 9c2f5f658223 vcl/inc/pregraphitestl.h
 +#   include _STLP_NATIVE_HEADER(ostream)
 +#   include _STLP_NATIVE_HEADER(istream)
 +#   include _STLP_NATIVE_HEADER(iostream)
++#   pragma GCC visibility pop
 +#endif
 +//sil_std resolves to the std that Graphite was built with
 +namespace sil_std = std;
-diff -r 9c2f5f658223 -r db11666c34f8 vcl/inc/pregraphitestl.h
---- vcl/inc/pregraphitestl.h	Thu Dec 17 13:57:53 2009 +0000
-+++ vcl/inc/pregraphitestl.h	Mon Jan 04 15:12:01 2010 +0000
-@@ -12,7 +12,9 @@
- #   undef _STLP_MAP
- #   define _STLP_DONT_REDEFINE_STD 1
- #   define _STLP_WHOLE_NATIVE_STD 1
-+#   pragma GCC visibility push(default)
- #   include _STLP_NATIVE_HEADER(exception_defines.h)
-+#   include _STLP_NATIVE_HEADER(limits)
- #   include _STLP_NATIVE_HEADER(memory)
- #   include _STLP_NATIVE_HEADER(exception)
- #   include _STLP_NATIVE_HEADER(iosfwd)
-@@ -24,6 +26,7 @@
- #   include _STLP_NATIVE_HEADER(ostream)
- #   include _STLP_NATIVE_HEADER(istream)
- #   include _STLP_NATIVE_HEADER(iostream)
-+#   pragma GCC visibility pop
- #endif
- //sil_std resolves to the std that Graphite was built with
- namespace sil_std = std;