Fix gcc 2.95.3 crash resulting from a symbol conflict

between libpackage2.so and libsvx641fi.so.

Enable gcc 2.95.3 build again. OO should build and work now
in STABLE with the system gcc.

Obtained from:		Alexander Kabaev <ak03@gte.com>

9 files changed, 214 insertions, 10 deletions

diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index a89d94e8234..43065f3a359 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -19,16 +19,8 @@ DISTFILES=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \
 
 .include <bsd.port.pre.mk>
 
-#
-# The OO build is broken with system gcc at the moment.
-# You can override this.
-#
-.if !defined(USE_GCC)
-USE_GCC=3.1
-.endif
-
 .if ${OSVERSION} > 500000
-.if ${USE_GCC} == 3.1
+.if defined(USE_GCC) && ${USE_GCC} == 3.1
 #
 # We depend on the port. System g++ is broken at the moment.
 #
@@ -164,7 +156,7 @@ pre-fetch:
 	@${ECHO} stable as it should.
 	@${ECHO}
 	@${ECHO} KERNEL CONFIGURATION:
-.if ${USE_GCC} == 2.95
+.if defined(USE_GCC) && ${USE_GCC} == 2.95
 	@${ECHO}
 	@${ECHO} Openoffice needs a larger stack- and
 	@${ECHO} datasize to build. Check your limit
diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx
new file mode 100644
index 00000000000..35052d291ef
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx
@@ -0,0 +1,20 @@
+--- ../package/inc/HashMaps.hxx.orig	Tue Oct 30 14:52:18 2001
++++ ../package/inc/HashMaps.hxx	Wed Jun 12 23:10:42 2002
+@@ -79,7 +79,7 @@
+ };
+ 
+ class ZipPackageFolder;
+-class ContentInfo;
++class ZipContentInfo;
+ 
+ typedef std::hash_map < rtl::OUString, 
+ 						ZipPackageFolder *,
+@@ -87,7 +87,7 @@
+ 						eqFunc > FolderHash;
+ 
+ typedef std::hash_map < rtl::OUString, 
+-						vos::ORef < ContentInfo >,
++						vos::ORef < ZipContentInfo >,
+ 						::rtl::OUStringHash, 
+ 						eqFunc > ContentHash;
+ 
diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx
new file mode 100644
index 00000000000..014c6140338
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx
@@ -0,0 +1,11 @@
+--- ../package/inc/ZipPackageFolder.hxx.orig	Thu Nov 15 21:01:49 2001
++++ ../package/inc/ZipPackageFolder.hxx	Wed Jun 12 23:10:42 2002
+@@ -106,7 +106,7 @@
+ 
+ 	void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
+ 		throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+-	ContentInfo & doGetByName( const ::rtl::OUString& aName )
++	ZipContentInfo & doGetByName( const ::rtl::OUString& aName )
+ 		throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ 	static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
+ 	static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId()
diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
new file mode 100644
index 00000000000..c4bf35e79f6
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx
@@ -0,0 +1,34 @@
+--- ../package/source/zippackage/ContentInfo.hxx.orig	Tue Oct 30 14:54:47 2001
++++ ../package/source/zippackage/ContentInfo.hxx	Wed Jun 12 23:10:42 2002
+@@ -75,7 +75,7 @@
+ #endif
+ #include <hash_map>
+ 
+-class ContentInfo : public cppu::OWeakObject
++class ZipContentInfo : public cppu::OWeakObject
+ {
+ public:
+ 	com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel;
+@@ -85,19 +85,19 @@
+ 		ZipPackageFolder *pFolder;
+ 		ZipPackageStream *pStream;
+ 	};
+-	ContentInfo ( ZipPackageStream * pNewStream ) 
++	ZipContentInfo ( ZipPackageStream * pNewStream ) 
+ 	: bFolder ( false )
+ 	, pStream ( pNewStream )
+ 	, xTunnel ( pNewStream )
+ 	{
+ 	}
+-	ContentInfo ( ZipPackageFolder * pNewFolder ) 
++	ZipContentInfo ( ZipPackageFolder * pNewFolder ) 
+ 	: bFolder ( true )
+ 	, pFolder ( pNewFolder )
+ 	, xTunnel ( pNewFolder )
+ 	{
+ 	}
+-	virtual ~ContentInfo () 
++	virtual ~ZipContentInfo () 
+ 	{
+ 		if ( bFolder )
+ 			pFolder->releaseUpwardRef();
diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
new file mode 100644
index 00000000000..bb504c834ee
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx
@@ -0,0 +1,41 @@
+--- ../package/source/zippackage/ZipPackageFolder.cxx.orig	Wed Jun 12 23:09:16 2002
++++ ../package/source/zippackage/ZipPackageFolder.cxx	Wed Jun 12 23:10:42 2002
+@@ -212,7 +212,7 @@
+ 	return maContents.size() > 0;
+ }
+ 	// XNameAccess
+-ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
++ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
+ 	throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+ {
+ 	ContentHash::iterator aIter = maContents.find ( aName );
+@@ -286,7 +286,7 @@
+ 		  aCI++)
+ 	{ 
+ 		const OUString &rShortName = (*aCI).first;
+-		const ContentInfo &rInfo = *(*aCI).second;
++		const ZipContentInfo &rInfo = *(*aCI).second;
+ 
+ 		Sequence < PropertyValue > aPropSet (2);
+ 		PropertyValue *pValue = aPropSet.getArray();
+@@ -533,7 +533,7 @@
+ 		  aCI!=maContents.end();
+ 		  aCI++)
+ 	{ 
+-		ContentInfo &rInfo = * (*aCI).second;
++		ZipContentInfo &rInfo = * (*aCI).second;
+ 		if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () )
+ 			rInfo.pFolder->releaseUpwardRef();
+ 		else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() )
+@@ -577,9 +577,9 @@
+ 		throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+ {
+ 	if ( pEntry->IsFolder() )
+-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
++		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
+ 	else
+-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
++		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
+ 
+ 	if ( bSetParent )
+ 		pEntry->setParent ( *this );
diff --git a/editors/openoffice.org-1.0/files/patch-package::inc::HashMaps.hxx b/editors/openoffice.org-1.0/files/patch-package::inc::HashMaps.hxx
new file mode 100644
index 00000000000..35052d291ef
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package::inc::HashMaps.hxx
@@ -0,0 +1,20 @@
+--- ../package/inc/HashMaps.hxx.orig	Tue Oct 30 14:52:18 2001
++++ ../package/inc/HashMaps.hxx	Wed Jun 12 23:10:42 2002
+@@ -79,7 +79,7 @@
+ };
+ 
+ class ZipPackageFolder;
+-class ContentInfo;
++class ZipContentInfo;
+ 
+ typedef std::hash_map < rtl::OUString, 
+ 						ZipPackageFolder *,
+@@ -87,7 +87,7 @@
+ 						eqFunc > FolderHash;
+ 
+ typedef std::hash_map < rtl::OUString, 
+-						vos::ORef < ContentInfo >,
++						vos::ORef < ZipContentInfo >,
+ 						::rtl::OUStringHash, 
+ 						eqFunc > ContentHash;
+ 
diff --git a/editors/openoffice.org-1.0/files/patch-package::inc::ZipPackageFolder.hxx b/editors/openoffice.org-1.0/files/patch-package::inc::ZipPackageFolder.hxx
new file mode 100644
index 00000000000..014c6140338
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package::inc::ZipPackageFolder.hxx
@@ -0,0 +1,11 @@
+--- ../package/inc/ZipPackageFolder.hxx.orig	Thu Nov 15 21:01:49 2001
++++ ../package/inc/ZipPackageFolder.hxx	Wed Jun 12 23:10:42 2002
+@@ -106,7 +106,7 @@
+ 
+ 	void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
+ 		throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+-	ContentInfo & doGetByName( const ::rtl::OUString& aName )
++	ZipContentInfo & doGetByName( const ::rtl::OUString& aName )
+ 		throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ 	static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
+ 	static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId()
diff --git a/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ContentInfo.hxx b/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ContentInfo.hxx
new file mode 100644
index 00000000000..c4bf35e79f6
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ContentInfo.hxx
@@ -0,0 +1,34 @@
+--- ../package/source/zippackage/ContentInfo.hxx.orig	Tue Oct 30 14:54:47 2001
++++ ../package/source/zippackage/ContentInfo.hxx	Wed Jun 12 23:10:42 2002
+@@ -75,7 +75,7 @@
+ #endif
+ #include <hash_map>
+ 
+-class ContentInfo : public cppu::OWeakObject
++class ZipContentInfo : public cppu::OWeakObject
+ {
+ public:
+ 	com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel;
+@@ -85,19 +85,19 @@
+ 		ZipPackageFolder *pFolder;
+ 		ZipPackageStream *pStream;
+ 	};
+-	ContentInfo ( ZipPackageStream * pNewStream ) 
++	ZipContentInfo ( ZipPackageStream * pNewStream ) 
+ 	: bFolder ( false )
+ 	, pStream ( pNewStream )
+ 	, xTunnel ( pNewStream )
+ 	{
+ 	}
+-	ContentInfo ( ZipPackageFolder * pNewFolder ) 
++	ZipContentInfo ( ZipPackageFolder * pNewFolder ) 
+ 	: bFolder ( true )
+ 	, pFolder ( pNewFolder )
+ 	, xTunnel ( pNewFolder )
+ 	{
+ 	}
+-	virtual ~ContentInfo () 
++	virtual ~ZipContentInfo () 
+ 	{
+ 		if ( bFolder )
+ 			pFolder->releaseUpwardRef();
diff --git a/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx b/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx
new file mode 100644
index 00000000000..bb504c834ee
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx
@@ -0,0 +1,41 @@
+--- ../package/source/zippackage/ZipPackageFolder.cxx.orig	Wed Jun 12 23:09:16 2002
++++ ../package/source/zippackage/ZipPackageFolder.cxx	Wed Jun 12 23:10:42 2002
+@@ -212,7 +212,7 @@
+ 	return maContents.size() > 0;
+ }
+ 	// XNameAccess
+-ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
++ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
+ 	throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+ {
+ 	ContentHash::iterator aIter = maContents.find ( aName );
+@@ -286,7 +286,7 @@
+ 		  aCI++)
+ 	{ 
+ 		const OUString &rShortName = (*aCI).first;
+-		const ContentInfo &rInfo = *(*aCI).second;
++		const ZipContentInfo &rInfo = *(*aCI).second;
+ 
+ 		Sequence < PropertyValue > aPropSet (2);
+ 		PropertyValue *pValue = aPropSet.getArray();
+@@ -533,7 +533,7 @@
+ 		  aCI!=maContents.end();
+ 		  aCI++)
+ 	{ 
+-		ContentInfo &rInfo = * (*aCI).second;
++		ZipContentInfo &rInfo = * (*aCI).second;
+ 		if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () )
+ 			rInfo.pFolder->releaseUpwardRef();
+ 		else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() )
+@@ -577,9 +577,9 @@
+ 		throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+ {
+ 	if ( pEntry->IsFolder() )
+-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
++		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) );
+ 	else
+-		maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
++		maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) );
+ 
+ 	if ( bSetParent )
+ 		pEntry->setParent ( *this );