[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

641d build successfull.



Hello !

I succesfully built a working oo 641d in testing + unstable stuff with gcc 3.04.

I used the instructions in http://www.openoffice.org/dev_docs/source/build_linux.html

In order to compile this beast (long, very long...), I did two things:

1) Patch /usr/include/X11/Xlib.h to add a missing prototype:

2) Patch two files in the oo sources (ttimes.cxx from the last cvs of oo, and thints.cxx to add the keyword 'class' 3 times).

I didn't invent anything, I only saw these stuff in oo mailing lists.

Patches enclosed
--- /usr/include/X11/Xlib.h.orig	Sun Apr  7 02:02:10 2002
+++ /usr/include/X11/Xlib.h	Sun Apr  7 02:02:28 2002
@@ -4615,6 +4615,12 @@
 #endif
 );
 
+extern char *XSetIMValues(
+#if NeedVarargsPrototypes
+    XIM /* im */, ...
+#endif
+);
+
 extern Display *XDisplayOfIM(
 #if NeedFunctionPrototypes
     XIM /* im */
--- sw/source/core/txtnode/thints.cxx.orig	Sun Apr  7 22:51:22 2002
+++ sw/source/core/txtnode/thints.cxx	Sun Apr  7 22:55:13 2002
@@ -1851,7 +1851,7 @@
 			( SFX_ITEM_SET == rNode.GetpSwAttrSet()->GetItemState( nWhich,
 				FALSE, &pParaItem ) ) && ( pParaItem == &pHint->GetAttr() );
 		BOOL bReplace = !( SETATTR_DONTREPLACE & nMode );
-		SwpHtStart_SAR *pTmpHints = 0;
+		class SwpHtStart_SAR *pTmpHints = 0;
 
 		USHORT i;
 		// Wir wollen zwar von nHtStart bis nMaxEnd, muessen aber ggf.
@@ -2027,7 +2027,7 @@
 									// Beim Einfuegen spaltet es sich selbst.
 										if( pHistory ) pHistory->Add( pOther );
 										if( !pTmpHints )
-											pTmpHints = new SwpHtStart_SAR();
+											pTmpHints = new class SwpHtStart_SAR();
 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
 											pTmpHints->Count() );
 										Cut( i );
@@ -2076,7 +2076,7 @@
 									// Beim Einfuegen spaltet es sich selbst.
 										if( pHistory ) pHistory->Add( pOther );
 										if( !pTmpHints )
-											pTmpHints = new SwpHtStart_SAR();
+											pTmpHints = new class SwpHtStart_SAR();
 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
 											pTmpHints->Count() );
 										Cut( i );
diff -u -r1.2 -r1.2.10.1
--- tools/source/datetime/ttime.cxx	2001/06/11 17:17:46	1.2
+++ tools/source/datetime/ttime.cxx	2002/03/19 13:38:21	1.2.10.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ttime.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.2.10.1 $
  *
- *  last change: $Author: er $ $Date: 2001/06/11 17:17:46 $
+ *  last change: $Author: svesik $ $Date: 2002/03/19 13:38:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 #include <dos.h>
 #elif defined UNX
 #include <limits.h>
-#ifdef IRIX
+#if defined( IRIX ) || defined( UNX )
 #include <unistd.h>
 #endif
 #include <sys/times.h>
@@ -493,7 +493,13 @@
 
 	if ( !nImplTicksPerSecond )
 	{
+#if defined( CLK_TCK )
 		nImplTicksPerSecond = CLK_TCK;
+#elif defined( _SC_CLK_TCK )
+		nImplTicksPerSecond = sysconf(_SC_CLK_TCK);
+#else
+#error "I don't know how to get CLK_TCK."
+#endif
 		dImplTicksPerSecond = nImplTicksPerSecond;
 		dImplTicksULONGMAX	= (double)(ULONG)ULONG_MAX;
 	}

Reply to: