fix build on sparc64 by removing some #if defined(linux)

This commit is contained in:
sturm 2003-11-18 22:02:09 +00:00
parent 73c1e6c599
commit fe6f078f04
6 changed files with 44 additions and 20 deletions

View File

@ -1,6 +1,6 @@
--- Imakefile.orig Tue Apr 30 07:07:30 2002
+++ Imakefile Sat Jan 4 13:19:29 2003
@@ -11,6 +11,7 @@
--- Imakefile.orig 2002-04-30 15:07:08.000000000 +0200
+++ Imakefile 2003-11-18 22:38:50.000000000 +0100
@@ -11,6 +11,7 @@ World:
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
@echo ""

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Xvnc_config_cf_vnc_def,v 1.1 2002/06/03 18:11:07 todd Exp $
--- Xvnc/config/cf/vnc.def.orig Mon Jun 3 08:16:27 2002
+++ Xvnc/config/cf/vnc.def Mon Jun 3 08:10:51 2002
@@ -117,7 +117,7 @@
$OpenBSD: patch-Xvnc_config_cf_vnc_def,v 1.2 2003/11/18 22:02:09 sturm Exp $
--- Xvnc/config/cf/vnc.def.orig 2002-11-13 19:03:27.000000000 +0100
+++ Xvnc/config/cf/vnc.def 2003-11-18 22:38:50.000000000 +0100
@@ -120,7 +120,7 @@
#ifdef SunArchitecture
#define ProjectRoot /usr/openwin
#else

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Xvnc_programs_Xserver_cfb_stipsparc_s,v 1.1 2003/11/18 22:02:09 sturm Exp $
--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig 2003-11-18 22:36:06.000000000 +0100
+++ Xvnc/programs/Xserver/cfb/stipsparc.s 2003-11-18 22:36:23.000000000 +0100
@@ -85,7 +85,7 @@ in this Software without prior written a
#define ForEachBits LY4
#define NextBits LY5
-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfbStippleStack cfbStippleStackTE
#else

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Xvnc_programs_Xserver_cfb_stipsprc32_s,v 1.1 2003/11/18 22:02:09 sturm Exp $
--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig 2003-11-18 22:41:28.000000000 +0100
+++ Xvnc/programs/Xserver/cfb/stipsprc32.s 2003-11-18 22:41:38.000000000 +0100
@@ -81,7 +81,7 @@ in this Software without prior written a
#define ForEachBits LY4
#define NextBits LY5
-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfb32StippleStack cfb32StippleStackTE
#else

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-vncserver,v 1.2 2002/03/25 11:57:45 wilfried Exp $
--- vncserver.orig Wed Mar 20 00:40:46 2002
+++ vncserver Sun Mar 24 19:42:20 2002
@@ -56,13 +56,23 @@
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
"twm &\n");
$OpenBSD: patch-vncserver,v 1.3 2003/11/18 22:02:09 sturm Exp $
--- vncserver.orig 2002-11-14 17:56:48.000000000 +0100
+++ vncserver 2003-11-18 22:38:51.000000000 +0100
@@ -75,13 +75,23 @@ unless ($xauthorityFile) {
}
}
+$defaultFontPath
+ = (
@ -26,7 +26,7 @@ $OpenBSD: patch-vncserver,v 1.2 2002/03/25 11:57:45 wilfried Exp $
&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -85,6 +95,25 @@
@@ -104,6 +114,25 @@ if ($opt{'-pixelformat'}) {
&CheckGeometryAndDepth();
@ -52,15 +52,15 @@ $OpenBSD: patch-vncserver,v 1.2 2002/03/25 11:57:45 wilfried Exp $
if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
}
@@ -210,6 +239,7 @@
@@ -235,6 +264,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber")
$ENV{DISPLAY}= "$host:$displayNumber";
}
$ENV{VNCDESKTOP}= $desktopName;
+$ENV{XAUTHORITY}= $xauthorityFile;
system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
@@ -221,6 +251,8 @@
@@ -246,6 +276,8 @@ exit;
# CheckGeometryAndDepth simply makes sure that the geometry and depth values
# are sensible.
#

View File

@ -1,6 +1,6 @@
--- vncviewer/Imakefile.orig Thu Jun 27 23:53:19 2002
+++ vncviewer/Imakefile Sat Jan 4 12:53:10 2003
@@ -10,17 +10,10 @@
--- vncviewer/Imakefile.orig 2002-06-28 07:52:57.000000000 +0200
+++ vncviewer/Imakefile 2003-11-18 22:38:51.000000000 +0100
@@ -10,17 +10,10 @@ XCOMM seems to cause problems on Digital
DEFINES = -DMITSHM
#endif