Magellan Linux

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

    Contents of /trunk/vnc/patches/vnc-includes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 637 - (show annotations) (download)
    Tue Jun 3 20:32:55 2008 UTC (15 years, 11 months ago) by niro
    File size: 1791 byte(s) 
    -added several new fixes from fedora
    1 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc
    2 --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.includes 2008-04-04 13:54:24.000000000 +0200
    3 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc 2008-04-04 13:54:49.000000000 +0200
    4 @@ -22,8 +22,8 @@
    5 extern "C" {
    6 #define class c_class
    7 #define NEED_EVENTS
    8 -#include "X.h"
    9 -#include "Xproto.h"
    10 +#include <X11/X.h>
    11 +#include <X11/Xproto.h>
    12 #include "misc.h"
    13 #include "os.h"
    14 #include "dixstruct.h"
    15 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc
    16 --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.includes 2008-04-04 13:55:07.000000000 +0200
    17 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc 2008-04-04 13:55:29.000000000 +0200
    18 @@ -50,9 +50,9 @@ extern char *display;
    19 #include "resource.h"
    20 #include "cursorstr.h"
    21 #include "windowstr.h"
    22 -#include "mi/mi.h"
    23 +#include "mi.h"
    24 #define XK_CYRILLIC
    25 -#include "keysym.h"
    26 +#include <X11/keysym.h>
    27 #undef public
    28 #undef class
    29 }
    30 diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.includes vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc
    31 --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.includes 2008-04-04 13:57:34.000000000 +0200
    32 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc 2008-04-04 13:57:44.000000000 +0200
    33 @@ -68,7 +68,7 @@ extern "C" {
    34 #include <X11/XWDFile.h>
    35 #include "dix.h"
    36 #include "inputstr.h"
    37 -#include "keysym.h"
    38 +#include <X11/keysym.h>
    39 extern int defaultColorVisualClass;
    40 #undef new
    41 #undef class