You should be able to apply this to the 1.0 branch. I recommend that we do so for 1.0.1.
dcomman...@users.sourceforge.net wrote: > Revision: 3942 > http://tigervnc.svn.sourceforge.net/tigervnc/?rev=3942&view=rev > Author: dcommander > Date: 2010-01-11 20:53:00 +0000 (Mon, 11 Jan 2010) > > Log Message: > ----------- > Remove xfs support, because it doesn't work and isn't needed > > Modified Paths: > -------------- > trunk/unix/vncserver > > Modified: trunk/unix/vncserver > =================================================================== > --- trunk/unix/vncserver 2010-01-11 13:46:48 UTC (rev 3941) > +++ trunk/unix/vncserver 2010-01-11 20:53:00 UTC (rev 3942) > @@ -82,13 +82,6 @@ > > chop($host = `uname -n`); > > -if (CheckXFS(1)) { > - $fontPath = "unix/:7100"; > -} else { > - if (CheckXFS(0)) { > - $fontPath = "inet/:7100"; # Some Solaris systems require this > - } > -} > if (-d "/etc/X11/fontpath.d") { > $fontPath = "catalogue:/etc/X11/fontpath.d"; > } > @@ -114,12 +107,17 @@ > } > } > } > + > if ($defFontPath) { > if (substr($defFontPath, -1, 1) == ',') { > chop $defFontPath; > } > } > > +if ($fontPath eq "") { > + $fontPath = $defFontPath; > +} > + > # Check command line options > > &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1, > @@ -250,22 +248,23 @@ > # Give Xvnc a chance to start up > > sleep(3); > -unless (kill 0, `cat $pidFile`) { > - if ($fpArgSpecified) { > - warn "\nWARNING: The first attempt to start Xvnc failed, probably > because the font\n"; > - warn "path you specified using the -fp argument is incorrect. > Attempting to\n"; > - warn "determine an appropriate font path for this system and restart > Xvnc using\n"; > - warn "that font path ...\n"; > - } else { > - warn "\nWARNING: The first attempt to start Xvnc failed, possibly > because the X Font\n"; > - warn "Server is not running and this system does not use a font > catalog. Attempting\n"; > - warn "to determine an appropriate font path for this system and restart > Xvnc using\n"; > - warn "that font path ...\n"; > +if ($fontPath ne $defFontPath) { > + unless (kill 0, `cat $pidFile`) { > + if ($fpArgSpecified) { > + warn "\nWARNING: The first attempt to start Xvnc failed, probably > because the font\n"; > + warn "path you specified using the -fp argument is incorrect. > Attempting to\n"; > + warn "determine an appropriate font path for this system and > restart Xvnc using\n"; > + warn "that font path ...\n"; > + } else { > + warn "\nWARNING: The first attempt to start Xvnc failed, possibly > because the font\n"; > + warn "catalog is not properly configured. Attempting to determine > an appropriate\n"; > + warn "font path for this system and restart Xvnc using that font > path ...\n"; > + } > + $cmd =~ s...@-fp [^ ]+@@; > + $cmd .= " -fp $defFontPath" if ($defFontPath); > + system("$cmd & echo \$! >$pidFile"); > + sleep(3); > } > - $cmd =~ s...@-fp [^ ]+@@; > - $cmd .= " -fp $defFontPath" if ($defFontPath); > - system("$cmd & echo \$! >$pidFile"); > - sleep(3); > } > unless (kill 0, `cat $pidFile`) { > warn "Could not start Xvnc.\n\n"; > @@ -411,29 +410,6 @@ > > > # > -# CheckXFS checks if the X Font Server is running on the default port (7100) > -# > - > -sub CheckXFS > -{ > - if ($_[0] == 1) { > - if (-e "/tmp/.font-unix/fs7100") { > - return 1; > - } > - } else { > - socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: > $!\n"; > - eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))'; > - if (!bind(S, pack('S n x12', $AF_INET, 7100))) { > - close(S); > - return 1; > - } > - } > - close(S); > - return 0; > -} > - > - > -# > # GetXDisplayDefaults uses xdpyinfo to find out the geometry, depth and pixel > # format of the current X display being used. If successful, it sets the > # options as appropriate so that the X VNC server will use the same settings > > > This was sent by the SourceForge.net collaborative development platform, the > world's largest Open Source development site. > > ------------------------------------------------------------------------------ > This SF.Net email is sponsored by the Verizon Developer Community > Take advantage of Verizon's best-in-class app development support > A streamlined, 14 day to market process makes app distribution fast and easy > Join now and get one step closer to millions of Verizon customers > http://p.sf.net/sfu/verizon-dev2dev > _______________________________________________ > Tigervnc-commits mailing list > tigervnc-comm...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tigervnc-commits ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tigervnc-devel mailing list Tigervnc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tigervnc-devel
