rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.12, 1.13 openoffice.org.spec, 1.1313, 1.1314

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sun Oct 7 11:49:19 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28393

Modified Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
	openoffice.org.spec 
Log Message:
reenable visibility again now that guard visibility is sane again

openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:

Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	28 Feb 2007 11:21:11 -0000	1.12
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	7 Oct 2007 11:49:16 -0000	1.13
@@ -1,644 +1,192 @@
-Index: inc/cppuhelper/compbase.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase.hxx	8 Sep 2005 09:03:54 -0000	1.13
-+++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase.hxx	26 Feb 2007 10:08:02 -0000
-@@ -41,7 +41,7 @@
- #ifndef _CPPUHELPER_IMPLBASE_HXX_
- #include <cppuhelper/implbase.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- /* This header should not be used anymore.
-    @deprecated
- */
-@@ -124,4 +124,5 @@
- __DEF_COMPIMPLHELPER_B( N ) \
- __DEF_COMPIMPLHELPER_C( N )
- 
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase1.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase1.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase1.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase1.hxx	19 Jun 2006 10:28:17 -0000	1.13
-+++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase1.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 1 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase10.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase10.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase10.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase10.hxx	19 Jun 2006 10:28:29 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase10.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 10 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase11.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase11.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase11.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase11.hxx	19 Jun 2006 10:28:40 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase11.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 11 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase12.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase12.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase12.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase12.hxx	19 Jun 2006 10:28:52 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase12.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 12 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase2.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase2.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase2.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase2.hxx	19 Jun 2006 10:29:03 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase2.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 2 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase3.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase3.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase3.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase3.hxx	19 Jun 2006 10:29:15 -0000	1.13
-+++ /openoffice.org/cppuhelper/inc/cppuhelper/compbase3.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 3 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase4.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase4.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase4.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase4.hxx	19 Jun 2006 10:29:26 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase4.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 4 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase5.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase5.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase5.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase5.hxx	19 Jun 2006 10:29:38 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase5.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 5 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase6.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase6.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase6.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase6.hxx	19 Jun 2006 10:29:53 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase6.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 6 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase7.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase7.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase7.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase7.hxx	19 Jun 2006 10:30:06 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase7.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 7 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase8.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase8.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase8.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase8.hxx	19 Jun 2006 10:30:19 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase8.hxx	26 Feb 2007 10:08:05 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 8 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase9.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase9.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase9.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase9.hxx	19 Jun 2006 10:30:40 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase9.hxx	26 Feb 2007 10:08:05 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 9 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -145,5 +145,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase_ex.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase_ex.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 compbase_ex.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase_ex.hxx	8 Sep 2005 09:10:47 -0000	1.3
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase_ex.hxx	26 Feb 2007 10:08:05 -0000
-@@ -50,7 +50,7 @@
- #include <com/sun/star/lang/XComponent.hpp>
- #endif
- 
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -190,5 +190,5 @@
-     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
- 
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase.hxx,v
-retrieving revision 1.14
-diff -u -r1.14 implbase.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase.hxx	8 Sep 2005 09:12:29 -0000	1.14
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase.hxx	26 Feb 2007 10:08:05 -0000
-@@ -54,7 +54,7 @@
- /* This header should not be used anymore.
-    @deprecated
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -310,5 +310,7 @@
- __DEF_IMPLHELPER_POST_A( N ) \
- __DEF_IMPLHELPER_POST_B( N ) \
- __DEF_IMPLHELPER_POST_C( N )
-+
-+#pragma GCC visibility pop
- #endif
- 
 Index: inc/cppuhelper/implbase1.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
 retrieving revision 1.16
 diff -u -r1.16 implbase1.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	13 Dec 2006 14:51:42 -0000	1.16
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	26 Feb 2007 10:08:05 -0000
-@@ -44,7 +44,7 @@
- #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
- #include <com/sun/star/uno/XComponentContext.hpp>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	6 Oct 2007 16:41:02 -0000
+@@ -60,7 +60,7 @@
      /** @internal */
-@@ -305,5 +305,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
+     template< typename Ifc1, typename Impl > struct ImplClassData1
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data1 s_cd =
+             {
 Index: inc/cppuhelper/implbase10.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase10.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx	5 Oct 2005 14:24:09 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	26 Feb 2007 10:08:05 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -308,5 +308,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	6 Oct 2007 16:41:02 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl > 
+ 	struct ImplClassData10
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data10 s_cd =
+             {
 Index: inc/cppuhelper/implbase11.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase11.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx	5 Oct 2005 14:24:35 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -309,5 +309,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	6 Oct 2007 16:41:03 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl > 
+ 	struct ImplClassData11
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data11 s_cd =
+             {
 Index: inc/cppuhelper/implbase12.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase12.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx	5 Oct 2005 14:25:08 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -310,5 +310,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	6 Oct 2007 16:41:03 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl > 
+ 	struct ImplClassData12
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data12 s_cd =
+             {
 Index: inc/cppuhelper/implbase2.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase2.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx	5 Oct 2005 14:25:28 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	6 Oct 2007 16:41:03 -0000
+@@ -57,7 +57,7 @@
      /** @internal */
-@@ -299,5 +299,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
+     template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data2 s_cd =
+             {
 Index: inc/cppuhelper/implbase3.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase3.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx	5 Oct 2005 14:25:47 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	6 Oct 2007 16:41:04 -0000
+@@ -57,7 +57,7 @@
      /** @internal */
-@@ -301,5 +301,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data3 s_cd =
+             {
 Index: inc/cppuhelper/implbase4.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase4.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx	5 Oct 2005 14:26:03 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -302,5 +302,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	6 Oct 2007 16:41:04 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl > 
+         struct ImplClassData4
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data4 s_cd =
+             {
 Index: inc/cppuhelper/implbase5.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase5.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx	5 Oct 2005 14:26:20 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -303,5 +303,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl > 
+         struct ImplClassData5
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data5 s_cd =
+             {
 Index: inc/cppuhelper/implbase6.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase6.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx	5 Oct 2005 14:26:37 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -304,5 +304,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl > 
+         struct ImplClassData6
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data6 s_cd =
+             {
 Index: inc/cppuhelper/implbase7.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase7.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx	5 Oct 2005 14:26:54 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -306,5 +306,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl > 
+         struct ImplClassData7
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data7 s_cd =
+             {
 Index: inc/cppuhelper/implbase8.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase8.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx	5 Oct 2005 14:27:12 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	26 Feb 2007 10:08:08 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -306,5 +306,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	6 Oct 2007 16:41:06 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > 
+ 	struct ImplClassData8
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data8 s_cd =
+             {
 Index: inc/cppuhelper/implbase9.hxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
 retrieving revision 1.15
 diff -u -r1.15 implbase9.hxx
 --- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx	5 Oct 2005 14:27:40 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	26 Feb 2007 10:08:08 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -308,5 +308,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase_ex.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 implbase_ex.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx	5 Oct 2005 14:27:57 -0000	1.6
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx	26 Feb 2007 10:08:08 -0000
-@@ -64,7 +64,7 @@
- __DEF_IMPLHELPER_EX( 3 )
- */
- 
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -187,5 +187,5 @@
-     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
- 
- }
--
-+#pragma GCC visibility pop
- #endif
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	6 Oct 2007 16:41:06 -0000
+@@ -58,7 +58,7 @@
+     template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl > 
+ 	struct ImplClassData9
+     {
+-        class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+         {
+             static class_data9 s_cd =
+             {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1313
retrieving revision 1.1314
diff -u -r1.1313 -r1.1314
--- openoffice.org.spec	4 Oct 2007 11:35:11 -0000	1.1313
+++ openoffice.org.spec	7 Oct 2007 11:49:16 -0000	1.1314
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1103,8 +1103,6 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-#visibility seem to be f*cked up right now
-unset HAVE_GCC_VISIBILITY_FEATURE
 #unneccessary to build for both hash types
 unset HAVE_LD_HASH_STYLE
 #faster build
@@ -2780,6 +2778,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sun Oct 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.2
+- reenable visibility again now that guard visibility is sane again
+
 * Thu Oct 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.1
 - Resolves: rhbz#299391 Serbian langpack name update
 - Resolves: rhbz#286221 allow custom printing commands

More information about the fedora-extras-commits mailing list