Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/vnc/patches/vnc-nohttpd.patch

    Annotation of /trunk/vnc/patches/vnc-nohttpd.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 1802 byte(s) 
    -import
    1 niro 153 --- vnc-4_1_1-unixsrc/unix/vncserver.nohttpd 2005-08-08 15:51:09.000000000 +0100
    2     +++ vnc-4_1_1-unixsrc/unix/vncserver 2005-08-11 12:13:59.000000000 +0100
    3     @@ -58,6 +58,7 @@
    4     # Check command line options
    5    
    6     &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
    7     + "-nohttpd",0,
    8     "-help",0,"-h",0,"--help",0);
    9    
    10     &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
    11     @@ -78,6 +79,12 @@
    12     if ($opt{'-pixelformat'}) {
    13     $pixelformat = $opt{'-pixelformat'};
    14     }
    15     +if ($opt{'-nohttpd'}) {
    16     + $nohttpd = 1;
    17     + }
    18     +else {
    19     + $nohttpd = 0;
    20     +}
    21    
    22     &CheckGeometryAndDepth();
    23    
    24     @@ -137,7 +144,7 @@
    25    
    26     $cmd = "Xvnc :$displayNumber";
    27     $cmd .= " -desktop " . &quotedString($desktopName);
    28     -$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles);
    29     +$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles && ! $nohttpd);
    30     $cmd .= " -auth $xauthorityFile";
    31     $cmd .= " -geometry $geometry" if ($geometry);
    32     $cmd .= " -depth $depth" if ($depth);
    33     @@ -413,7 +420,7 @@
    34    
    35     sub Usage
    36     {
    37     - die("\nusage: $prog [:<number>] [-name <desktop-name>] [-depth <depth>]\n".
    38     + die("\nusage: $prog [:<number>] [-nohttpd] [-name <desktop-name>] [-depth <depth>]\n".
    39     " [-geometry <width>x<height>]\n".
    40     " [-pixelformat rgbNNN|bgrNNN]\n".
    41     " <Xvnc-options>...\n\n".
    42     --- vnc-4_1_1-unixsrc/unix/vncserver.man.nohttpd 2005-08-11 12:17:46.000000000 +0100
    43     +++ vnc-4_1_1-unixsrc/unix/vncserver.man 2005-08-11 12:19:35.000000000 +0100
    44     @@ -77,6 +77,11 @@
    45     must be 8 bits deep.
    46    
    47     .TP
    48     +.B \-nohttpd
    49     +Do not instruct Xvnc to run a mini-httpd if the VNC Java applet is
    50     +found.
    51     +
    52     +.TP
    53     .B \-kill :\fIdisplay#\fP
    54     This kills a VNC desktop previously started with vncserver. It does this by
    55     killing the Xvnc process, whose process ID is stored in the file