]>
Commit | Line | Data |
---|---|---|
0a647b91 JB |
1 | --- ooo-build-1.3.0/patches/OOO_1_1_2/apply.orig 2004-07-22 20:46:36.000000000 +0200 |
2 | +++ ooo-build-1.3.0/patches/OOO_1_1_2/apply 2004-07-22 20:48:12.000000000 +0200 | |
3 | @@ -756,6 +756,9 @@ | |
4 | # splash | |
5 | pld-splash.diff | |
6 | ||
7 | +# shared libXinerama | |
8 | +xinerama-shared.diff | |
9 | + | |
10 | ####################################################### | |
11 | [ ArkOnly ] | |
12 | ||
13 | --- ooo-build-1.3.0/patches/OOO_1_1/xinerama-shared.diff.orig 1970-01-01 01:00:00.000000000 +0100 | |
14 | +++ ooo-build-1.3.0/patches/OOO_1_1/xinerama-shared.diff 2004-07-22 20:43:12.000000000 +0200 | |
15 | @@ -0,0 +1,38 @@ | |
16 | +--- vcl/util/makefile.mk 15 Aug 2003 11:26:42 -0000 1.47.10.1 | |
17 | ++++ vcl/util/makefile.mk 27 Nov 2003 17:52:05 -0000 | |
18 | +@@ -293,9 +293,7 @@ | |
617ccb17 JB |
19 | + SHL2STDLIBS += -lXext -lSM -lICE -lX11 |
20 | + # Others | |
21 | + .ELSE # "$(OS)"=="SOLARIS" | |
0a647b91 | 22 | +-.IF "$(CPU)" == "I" |
617ccb17 JB |
23 | +-SHL2STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic |
24 | +-.ENDIF # "$(CPU)=="I" | |
25 | ++SHL2STDLIBS += -lXinerama | |
26 | + SHL2STDLIBS += -lXext -lSM -lICE -lX11 | |
0a647b91 | 27 | + .ENDIF # "$(OS)"=="SOLARIS" |
617ccb17 | 28 | + |
0a647b91 JB |
29 | +Index: saldisp.cxx |
30 | +=================================================================== | |
31 | +RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v | |
32 | +retrieving revision 1.44.10.2 | |
33 | +diff -u -r1.44.10.2 saldisp.cxx | |
34 | +--- vcl/unx/source/app/saldisp.cxx 9 Jan 2004 18:14:00 -0000 1.44.10.2 | |
35 | ++++ vcl/unx/source/app/saldisp.cxx 29 May 2004 17:38:17 -0000 | |
36 | +@@ -235,7 +235,7 @@ | |
37 | + | |
38 | + #include <X11/Xatom.h> | |
39 | + #ifndef SOLARIS | |
40 | +-#if defined(X86) || defined(MACOSX) | |
41 | ++#if defined(LINUX) || defined(MACOSX) | |
42 | + #include <X11/extensions/Xinerama.h> | |
43 | + #endif | |
44 | + #endif | |
45 | +@@ -3067,7 +3067,7 @@ | |
46 | + } | |
47 | + osl_unloadModule( hModule ); | |
48 | + #else | |
49 | +-#if defined( X86 ) || defined( MACOSX ) | |
50 | ++#if defined( LINUX ) || defined( MACOSX ) | |
51 | + if( XineramaIsActive( pDisp_ ) ) | |
52 | + { | |
53 | + int nFramebuffers = 1; |