ooo-build r12165 - in trunk: . patches/dev300 patches/src680

[rodo svn gnome org]

Author: rodo
Date: Tue Apr 15 11:03:30 2008
New Revision: 12165
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12165&view=rev

Log:
2008-04-15  Radek Doulik  <rodo novell com>

	* patches/dev300/apply: added vcl-xinerama-64bit-fix.diff as well

	* patches/src680/apply: added vcl-xinerama-64bit-fix.diff with
	changes below

	* build/ooh680-m12/vcl/unx/source/app/saldisp.cxx: check for
	X86_64 as well as for X86 to make Xinerama support working on
	64bit machines/builds



Added:
   trunk/patches/src680/vcl-xinerama-64bit-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/src680/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 15 11:03:30 2008
@@ -2092,3 +2092,6 @@
 # build our stuff
 # FIXME: should be in the respective patches
 buildfix-no-UPD-in-library-names.diff, jholesov
+
+[ Fixes ]
+vcl-xinerama-64bit-fix.diff, rodo

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr 15 11:03:30 2008
@@ -2259,3 +2259,6 @@
 libwpg-testing.diff
 libwps-testing.diff
 writerperfect-testing.diff
+
+[ Fixes ]
+vcl-xinerama-64bit-fix.diff, rodo

Added: trunk/patches/src680/vcl-xinerama-64bit-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/vcl-xinerama-64bit-fix.diff	Tue Apr 15 11:03:30 2008
@@ -0,0 +1,21 @@
+diff -rup vcl/unx/source/app-orig/saldisp.cxx vcl/unx/source/app/saldisp.cxx
+--- vcl/unx/source/app-orig/saldisp.cxx	2008-04-15 11:49:38.000000000 +0200
++++ vcl/unx/source/app/saldisp.cxx	2008-04-15 11:50:44.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ #ifdef USE_XINERAMA
+ #ifdef USE_XINERAMA_XORG
+-#if defined(X86) || defined(MACOSX)
++#if defined(X86) || defined(X86_64) || defined(MACOSX)
+ #include <X11/extensions/Xinerama.h>
+ #endif
+ #elif defined USE_XINERAMA_XSUN
+@@ -2723,7 +2723,7 @@ void SalDisplay::InitXinerama()
+         }
+     }
+ #elif defined(USE_XINERAMA_XORG)
+-#if defined( X86 ) || defined( MACOSX )
++#if defined( X86 ) || defined( X86_64 ) || defined( MACOSX )
+ if( XineramaIsActive( pDisp_ ) )
+ {
+     int nFramebuffers = 1;