Added patches to fix bug #46089 and added ~sparc keyword to openoffice-1.1.1-r1

4 files changed, 463 insertions, 10 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 036fbb939824..afeffe5a603f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.73 2004/05/12 11:17:05 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.74 2004/05/25 13:12:32 weeve Exp $
+
+  25 May 2004; Jason Wever <weeve@gentoo.org> +files/1.1.1/linux-sparc.patch,
+  openoffice-1.1.1-r1.ebuild:
+  Added patches to fix bug #46089 and added ~sparc keyword to openoffice-1.1.1-r1
 
   12 May 2004; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r2.ebuild:
   removed hardened-gcc check and CC variable modification
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 79335d939efb..34fe4613931c 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,9 +1,9 @@
-MD5 f3f3aa945deec0e2f81d85e9feaf5529 ChangeLog 17053
+MD5 38bccaa72350fca501382f2454a10e4e ChangeLog 17244
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
+MD5 ca1513a7b70fc820e3264bc11c218cf5 openoffice-1.0.3-r2.ebuild 21352
 MD5 0d4e399ca510dcbac9772ca214530b25 openoffice-1.1.0-r4.ebuild 20394
 MD5 eaec6c07e6adbe6357128fb57f285d5d openoffice-1.1.0-r5.ebuild 16013
-MD5 ca1513a7b70fc820e3264bc11c218cf5 openoffice-1.0.3-r2.ebuild 21352
-MD5 2fb2c46fd3625ee353a347adc815d6d1 openoffice-1.1.1-r1.ebuild 16376
+MD5 649afc84f14230eeeb8ef1f5f6d9cfef openoffice-1.1.1-r1.ebuild 16367
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195
 MD5 601e987d3fa97d8dfc4cdd052b0e9832 files/digest-openoffice-1.1.0-r5 128
@@ -35,9 +35,10 @@ MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.
 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
-MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1/newstlportfix.patch 10032
 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
+MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
+MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
diff --git a/app-office/openoffice/files/1.1.1/linux-sparc.patch b/app-office/openoffice/files/1.1.1/linux-sparc.patch
new file mode 100644
index 000000000000..9325e23117b7
--- /dev/null
+++ b/app-office/openoffice/files/1.1.1/linux-sparc.patch
@@ -0,0 +1,449 @@
+Index: boost/boost_1_27_0.patch
+===================================================================
+RCS file: /cvs/external/boost/boost_1_27_0.patch,v
+retrieving revision 1.4.10.1
+diff -u -u -r1.4.10.1 boost_1_27_0.patch
+--- boost/boost_1_27_0.patch	15 Aug 2003 11:47:26 -0000	1.4.10.1
++++ boost/boost_1_27_0.patch	10 Mar 2004 05:42:33 -0000
+@@ -31,7 +31,26 @@
+ + #if defined(BOOST_OOO_NO_NEW_EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
+ + #define BOOST_NO_EXCEPTIONS
+ + #endif
+-+ 
+++
++*** misc/boost_1_27_0/boost/detail/atomic_count.hpp	Fri Feb  8 02:26:13 2002
++--- misc/build/boost_1_27_0/boost/detail/atomic_count.hpp	Fri Dec 19 01:00:46 2003
++***************
++*** 93,99 ****
++
++  #include <boost/detail/atomic_count_win32.hpp>
++
++! #elif defined(linux) || defined(__linux) || defined(__linux__)
++
++  #include <boost/detail/atomic_count_linux.hpp>
++
++--- 93,99 ----
++
++  #include <boost/detail/atomic_count_win32.hpp>
++
++! #elif (defined(linux) || defined(__linux) || defined(__linux__)) && !(defined(SPARC) || defined(sparc) || defined(sparc64))
++
++  #include <boost/detail/atomic_count_linux.hpp>
++  
+ *** misc/boost_1_27_0/boost/detail/atomic_count_linux.hpp	Thu Feb  7 10:26:13 2002
+ --- misc/build/boost_1_27_0/boost/detail/atomic_count_linux.hpp	Wed May  7 11:28:19 2003
+ ***************
+@@ -157,7 +176,7 @@
+ --- misc/build/boost_1_27_0/boost/detail/linux_atomic.h	Wed May  7 11:32:48 2003
+ ***************
+ *** 0 ****
+---- 1,181 ----
++--- 1,118 ----
+ + #ifndef _LINUX_ATOMIC_H_
+ + #define _LINUX_ATOMIC_H_
+ + 
+@@ -268,70 +287,7 @@
+ +	__CS_LOOP(old_val, new_val, v, 1, "sr");
+ +        return new_val;
+ +}
+-+#elif defined ( SPARC )
+-+
+-+
+-+#define atomic_set(v, i)	(((v)->aVal) = ((i) << 8))
+-+
+-+static __inline__ int __atomic_add(int i, atomic_t *v)
+-+{
+-+	register volatile int *ptr asm("g1");
+-+	register int increment asm("g2");
+-+
+-+	ptr = &v->aVal;
+-+	increment = i;
+-+
+-+	__asm__ __volatile__(
+-+	"mov	%%o7, %%g4\n\t"
+-+	"call	___atomic_add\n\t"
+-+	" add	%%o7, 8, %%o7\n"
+-+	: "=&r" (increment)
+-+	: "0" (increment), "r" (ptr)
+-+	: "g3", "g4", "g7", "memory", "cc");
+-+
+-+	return increment;
+-+}
+ +
+-+static __inline__ int __atomic_sub(int i, atomic_t *v)
+-+{
+-+	register volatile int *ptr asm("g1");
+-+	register int increment asm("g2");
+-+
+-+	ptr = &v->aVal;
+-+	increment = i;
+-+
+-+	__asm__ __volatile__(
+-+	"mov	%%o7, %%g4\n\t"
+-+	"call	___atomic_sub\n\t"
+-+	" add	%%o7, 8, %%o7\n"
+-+	: "=&r" (increment)
+-+	: "0" (increment), "r" (ptr)
+-+	: "g3", "g4", "g7", "memory", "cc");
+-+
+-+	return increment;
+-+}
+-+
+-+#define atomic_add(i, v) ((void)__atomic_add((i), (v)))
+-+#define atomic_sub(i, v) ((void)__atomic_sub((i), (v)))
+-+
+-+#define atomic_dec_return(v) __atomic_sub(1, (v))
+-+#define atomic_inc_return(v) __atomic_add(1, (v))
+-+
+-+#define atomic_sub_and_test(i, v) (__atomic_sub((i), (v)) == 0)
+-+#define atomic_dec_and_test(v) (__atomic_sub(1, (v)) == 0)
+-+
+-+#define atomic_inc(v) ((void)__atomic_add(1, (v)))
+-+#define atomic_dec(v) ((void)__atomic_sub(1, (v)))
+-+
+-+#define atomic_add_negative(i, v) (__atomic_add((i), (v)) < 0)
+-+
+-+/* Atomic operations are already serializing */
+-+#define smp_mb__before_atomic_dec()	barrier()
+-+#define smp_mb__after_atomic_dec()	barrier()
+-+#define smp_mb__before_atomic_inc()	barrier()
+-+#define smp_mb__after_atomic_inc()	barrier()
+-+ 
+-+#endif
+ + #else
+ + 
+ + #error - need to define your processors atomic inc and dec here
+Index: boost/makefile.mk
+===================================================================
+RCS file: /cvs/external/boost/makefile.mk,v
+retrieving revision 1.4
+diff -u -u -r1.4 makefile.mk
+--- boost/makefile.mk	2 Jul 2003 15:23:23 -0000	1.4
++++ boost/makefile.mk	10 Mar 2004 05:42:33 -0000
+@@ -76,7 +76,7 @@
+ 
+ PATCH_FILE_NAME=boost_1_27_0.patch
+ 
+-#ADDITIONAL_FILES=
++ADDITIONAL_FILES=boost$/detail$/linux_atomic.h
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=
+Index: bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
+retrieving revision 1.2
+diff -u -u -r1.2 cpp2uno.cxx
+--- bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	28 Apr 2003 16:28:42 -0000	1.2
++++ bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	10 Mar 2004 05:42:33 -0000
+@@ -163,8 +163,21 @@
+ 			{
+ 			case typelib_TypeClass_HYPER:
+ 			case typelib_TypeClass_UNSIGNED_HYPER:
+-			case typelib_TypeClass_DOUBLE:
+-				pCppStack += sizeof(sal_Int32); // extra long
++            		case typelib_TypeClass_DOUBLE:
++            		{
++			if ((reinterpret_cast< long >(pCppStack) & 7) != 0)
++              		{
++		   		OSL_ASSERT( sizeof (double) == sizeof (sal_Int64) );
++                   		void * pDest = alloca( sizeof (sal_Int64) );
++                  	 	*reinterpret_cast< sal_Int32 * >(pDest) =
++                   		*reinterpret_cast< sal_Int32 const * >(pCppStack);
++                   		*(reinterpret_cast< sal_Int32 * >(pDest) + 1) =
++                   		*(reinterpret_cast< sal_Int32 const * >(pCppStack) + 1);
++                   		pCppArgs[nPos] = pUnoArgs[nPos] = pDest;
++			}
++		   	pCppStack += sizeof (sal_Int32); // extra long
++                   	break;
++			}
+ 			}
+ 			// no longer needed
+ 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+@@ -488,7 +501,7 @@
+ 	sal_Bool bComplex = nTableEntry & 0x80000000 ? sal_True : sal_False;
+ 
+ 	typelib_TypeClass aType =
+-		cpp_mediate( nTableEntry, pCallStack+17, &nRegReturn );
++		cpp_mediate( nTableEntry, pCallStack+17, (sal_Int64*)&nRegReturn );
+ 
+ 	switch( aType )
+ 	{
+Index: bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx,v
+retrieving revision 1.2.34.1
+diff -u -u -r1.2.34.1 uno2cpp.cxx
+--- bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx	15 Aug 2003 11:59:42 -0000	1.2.34.1
++++ bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx	10 Mar 2004 05:42:39 -0000
+@@ -359,16 +359,24 @@
+ 		if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr ))
+ 		{
+ 			pCppArgs[ nPos ] = adjustPointer( pCppStack, pParamTypeDescr );
+-			uno_copyAndConvertData( pCppArgs[nPos], pUnoArgs[nPos], pParamTypeDescr,
+-									&pThis->pBridge->aUno2Cpp );
+-			
+ 			switch (pParamTypeDescr->eTypeClass)
+ 			{
+ 			case typelib_TypeClass_HYPER:
+ 			case typelib_TypeClass_UNSIGNED_HYPER:
+ 			case typelib_TypeClass_DOUBLE:
+-				pCppStack += sizeof(sal_Int32); // extra long
+-			}
++                        OSL_ASSERT( sizeof (double) == sizeof (sal_Int64) );
++                          *reinterpret_cast< sal_Int32 * >(pCppStack) =
++                          *reinterpret_cast< sal_Int32 const * >(pUnoArgs[ nPos ]);
++                          pCppStack += sizeof (sal_Int32);
++                          *reinterpret_cast< sal_Int32 * >(pCppStack) =
++                          *(reinterpret_cast< sal_Int32 const * >(pUnoArgs[ nPos ] ) + 1);
++                          break;
++            		default:
++                          uno_copyAndConvertData(
++                             pCppArgs[nPos], pUnoArgs[nPos], pParamTypeDescr,
++                             &pThis->pBridge->aUno2Cpp );
++                          break;
++                        }
+ 			// no longer needed
+ 			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
+ 		}
+@@ -407,11 +415,15 @@
+ 
+ 	try
+ 	{
++		int nStackLongs = (pCppStack - pCppStackStart)/sizeof(sal_Int32);
+ 		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" );
+ 		callVirtualMethod(
+-			pThis->pCppI, nVtableCall,
+-			pCppReturn, pReturnTypeDescr->eTypeClass,
+-			(sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) );
++			pThis->pCppI,
++			nVtableCall,
++			pCppReturn,
++			pReturnTypeDescr->eTypeClass,
++			(sal_Int32 *)pCppStackStart,
++			 nStackLongs);
+ 		// NO exception occured...
+ 		*ppUnoExc = 0;
+ 		
+Index: cppu/source/uno/copy.hxx
+===================================================================
+RCS file: /cvs/udk/cppu/source/uno/copy.hxx,v
+retrieving revision 1.10
+diff -u -u -r1.10 copy.hxx
+--- cppu/source/uno/copy.hxx	20 Mar 2003 12:28:50 -0000	1.10
++++ cppu/source/uno/copy.hxx	10 Mar 2004 05:42:40 -0000
+@@ -752,12 +752,7 @@
+ 		break;
+ 	case typelib_TypeClass_HYPER:
+ 	case typelib_TypeClass_UNSIGNED_HYPER:
+-#if defined(GCC) && defined(SPARC)
+-		*(sal_Int32 *)pDest = *(sal_Int32 *)pSource;
+-		*(((sal_Int32 *)pDest) +1) = *(((sal_Int32 *)pSource) +1);
+-#else
+ 		*(sal_Int64 *)pDest = *(sal_Int64 *)pSource;
+-#endif
+ 		break;
+ 	case typelib_TypeClass_FLOAT:
+ 		*(float *)pDest = *(float *)pSource;
+Index: scp/source/office/files.scp
+===================================================================
+RCS file: /cvs/installation/scp/source/office/Attic/files.scp,v
+retrieving revision 1.369.16.9
+diff -u -u -r1.369.16.9 files.scp
+--- scp/source/office/files.scp	10 Feb 2004 20:05:45 -0000	1.369.16.9
++++ scp/source/office/files.scp	10 Mar 2004 05:44:58 -0000
+@@ -3301,6 +3301,26 @@
+ 
+ #endif
+ 
++
++#if defined (FAT_PRODUCT) && defined(LINUX) && defined(SPARC)
++
++Custom GID_CUSTOM_JVM
++    FileName = LIBNAME(jvm);
++    Styles = (EXEC_INST_BEFORE,STANDALONE,WORKSTATION,NETWORK,REPAIRABLE);
++	Code		= {
++        [Install]
++        InstallationPath=.
++        RequiredVersion=1.4.1_01
++        ExcludeVersion=
++        AdditionalClasspath=<OFFICE_CLASSDIR>/classes.jar:<OFFICE_CLASSDIR>/sandbox.jar:<OFFICE_CLASSDIR>/ridl.jar:<OFFICE_CLASSDIR>/unoil.jar:<OFFICE_CLASSDIR>/jurt.jar:<OFFICE_CLASSDIR>/juh.jar:<OFFICE_CLASSDIR>/java_uno.jar:<OFFICE_CLASSDIR>/xt.jar:<OFFICE_CLASSDIR>/jaxp.jar:<OFFICE_CLASSDIR>/java_uno_accessbridge.jar:<OFFICE_CLASSDIR>/aportisdoc.jar:<OFFICE_CLASSDIR>/htmlsoff.jar:<OFFICE_CLASSDIR>/jmc.jar:<OFFICE_CLASSDIR>/minicalc.jar:<OFFICE_CLASSDIR>/pexcel.jar:<OFFICE_CLASSDIR>/pocketword.jar:<OFFICE_CLASSDIR>/XFlatXml.jar:<OFFICE_CLASSDIR>/xmerge.jar:<OFFICE_CLASSDIR>/XMergeBridge.jar:
++		AdditionalJars=javaplugin.jar;plugin.jar
++        CPLD=0
++    };
++End
++
++#endif
++
++
+ #endif
+                                   // of #ifdef SOLAR_JAVA
+ 
+? a.out
+? solar.c.stripped
+? test.c
+? x
+Index: solar.c
+===================================================================
+RCS file: /cvs/util/tools/source/solar/solar.c,v
+retrieving revision 1.2
+diff -u -r1.2 solar.c
+--- solar.c	15 Apr 2003 17:55:43 -0000	1.2
++++ tools/source/solar/solar.c	22 Oct 2003 13:08:21 -0000
+@@ -58,17 +58,22 @@
+  *
+  *
+  ************************************************************************/
+-#include <stdio.h>
+ 
+-#ifdef UNX
++/* POSIX defines that a program is undefined after a SIG_SEGV.  The
++ * code stopped working on Linux Kernel 2.6 so I have moved this back to
++ * use FORK.
++ * If at a later time the signals work correctly with the Linux Kernel 2.6
++ * then this change may be reverted although not strictly posix safe. */
++#define USE_FORK_TO_CHECK 1
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
+-#ifdef HPUX
+-#include <stdlib.h>
+-#endif
+-
+ #define I_STDARG
+ #ifdef I_STDARG
+ #include <stdarg.h>
+@@ -84,9 +89,6 @@
+ #include <setjmp.h>
+ #endif
+ 
+-#else
+-#endif
+-
+ #define printTypeSize(Type,Name)	printf(	"sizeof(%s)\t= %d\n", Name, sizeof (Type) )
+ 
+ #define isSignedType(Type)	(((Type)-1) < 0)
+@@ -133,7 +135,7 @@
+ 
+ /*************************************************************************
+ |*
+-|*	IsStackGrowingDown()
++|*	GetStackAlignment()
+ |*
+ |*	Beschreibung		Alignment von char Parametern, die (hoffentlich)
+ |*						ueber den Stack uebergeben werden
+@@ -176,8 +178,6 @@
+ typedef int (*TestFunc)( Type, void* );
+ 
+ 
+-#ifdef UNX
+-
+ /*************************************************************************
+ |*
+ |*	PrintArgs()
+@@ -230,11 +230,11 @@
+ void SignalHdl( int sig )
+ {
+   bSignal = 1;
+-  /*
++  
+   fprintf( stderr, "Signal %d caught\n", sig );
+-  signal( sig,	SignalHdl );
+-  /**/
+-  longjmp( check_env, sig );
++  signal( SIGSEGV,	SIG_DFL );
++  signal( SIGBUS,	SIG_DFL );
++  siglongjmp( check_env, sig );
+ }
+ #endif
+ 
+@@ -270,7 +270,7 @@
+ 
+   bSignal = 0;
+ 
+-  if ( !setjmp( check_env ) )
++  if ( !sigsetjmp( check_env, 0 ) )
+   {
+ 	signal( SIGSEGV,	SignalHdl );
+ 	signal( SIGBUS,		SignalHdl );
+@@ -286,9 +286,6 @@
+ #endif
+ }
+ 
+-#endif
+-
+-
+ /*************************************************************************
+ |*
+ |*	GetAtAddress()
+@@ -373,6 +370,7 @@
+ int CheckSetAccess( Type eT, void* p )
+ {
+   int b;
++
+   b = -1 != check( (TestFunc)SetAtAddress, eT, p );
+ #if OSL_DEBUG_LEVEL > 1
+   fprintf( stderr,
+@@ -437,7 +435,7 @@
+ |*	Letzte Aenderung
+ |*
+ *************************************************************************/
+-Description_Ctor( struct Description* pThis )
++void Description_Ctor( struct Description* pThis )
+ {
+   pThis->bBigEndian			= IsBigEndian();
+   pThis->bStackGrowsDown	= IsStackGrowingDown();
+@@ -468,16 +466,21 @@
+ |*	Letzte Aenderung
+ |*
+ *************************************************************************/
+-Description_Print( struct Description* pThis, char* name )
++void Description_Print( struct Description* pThis, char* name )
+ {
+   int i;
+   FILE* f = fopen( name, "w" );
++  if( ! f ) {
++	  fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) );
++	  exit( 99 );
++  }
+   fprintf( f, "#define __%s\n",
+ 		   pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" );
+   for ( i = 0; i < 3; i++ )
+ 	fprintf( f, "#define __ALIGNMENT%d\t%d\n",
+-			 1 << i+1, pThis->nAlignment[i] );
+-  fprintf( f, "#define __STACKALIGNMENT wird nicht benutzt\t%d\n", pThis->nStackAlignment );
++			 1 << (i+1), pThis->nAlignment[i] );
++  fprintf( f, "/* Stack alignment is not used... */\n" );
++  fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment );
+   fprintf( f, "#define __STACKDIRECTION\t%d\n",
+ 		   pThis->bStackGrowsDown ? -1 : 1 );
+   fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) );
+@@ -538,8 +541,12 @@
+ 	printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) );
+   }
+ }
+-
+-main( int argc, char* argv[] )
++/************************************************************************
++ *
++ * 	Use C code to determine the characteristics of the building platform.
++ *
++ ************************************************************************/
++int main( int argc, char* argv[] )
+ {
+   printTypeSign( char, "char" );
+   printTypeSign( short, "short" );
+@@ -574,7 +581,6 @@
+ 	Description_Ctor( &description );
+ 	Description_Print( &description, argv[1] );
+   }
+-
+   {
+ 	char* p = NULL;
+ 	InfoMemoryAccess( p );
diff --git a/app-office/openoffice/openoffice-1.1.1-r1.ebuild b/app-office/openoffice/openoffice-1.1.1-r1.ebuild
index d3af721ea529..fb17ea5f424d 100644
--- a/app-office/openoffice/openoffice-1.1.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.4 2004/05/07 14:40:14 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.5 2004/05/25 13:12:32 weeve Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -47,7 +47,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="LGPL-2 | SISSL-1.1"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 IUSE="gnome kde"
 
 RDEPEND=">=sys-libs/glibc-2.1
@@ -259,9 +259,8 @@ src_unpack() {
 	#Work around recent portage sandbox troubles
 	epatch ${FILESDIR}/${PV}/build.patch
 
-#	if [ ${ARCH} = "sparc" ]; then
-#		epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch
-#	fi
+	# Linux/SPARC fixes
+	[ `use sparc` ] && epatch ${FILESDIR}/${PV}/linux-sparc.patch
 
 	#Security fix
 	epatch ${FILESDIR}/${PV}/neon.patch