Contents of /trunk/tigervnc/patches/tigervnc-1.0.1-r3884.patch
Parent Directory | Revision Log
Revision 1201 -
(show annotations)
(download)
Mon Nov 22 23:25:59 2010 UTC (13 years, 10 months ago) by niro
File size: 3468 byte(s)
Mon Nov 22 23:25:59 2010 UTC (13 years, 10 months ago) by niro
File size: 3468 byte(s)
-patches for 1.0.1 against xorg-server-1.7
1 | Index: unix/xserver/hw/vnc/xvnc.cc |
2 | =================================================================== |
3 | --- unix/xserver/hw/vnc/xvnc.cc (revision 3883) |
4 | +++ unix/xserver/hw/vnc/xvnc.cc (revision 3884) |
5 | @@ -37,6 +37,7 @@ |
6 | #include <rfb/LogWriter.h> |
7 | #include <network/TcpSocket.h> |
8 | #include "vncExtInit.h" |
9 | +#include "xorg-version.h" |
10 | |
11 | extern "C" { |
12 | #define class c_class |
13 | Index: unix/xserver/hw/vnc/xorg-version.h |
14 | =================================================================== |
15 | --- unix/xserver/hw/vnc/xorg-version.h (revision 0) |
16 | +++ unix/xserver/hw/vnc/xorg-version.h (revision 3884) |
17 | @@ -0,0 +1,33 @@ |
18 | +/* Copyright (C) 2009 TightVNC Team |
19 | + * Copyright (C) 2009 Red Hat, Inc. |
20 | + * |
21 | + * This is free software; you can redistribute it and/or modify |
22 | + * it under the terms of the GNU General Public License as published by |
23 | + * the Free Software Foundation; either version 2 of the License, or |
24 | + * (at your option) any later version. |
25 | + * |
26 | + * This software is distributed in the hope that it will be useful, |
27 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
28 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
29 | + * GNU General Public License for more details. |
30 | + * |
31 | + * You should have received a copy of the GNU General Public License |
32 | + * along with this software; if not, write to the Free Software |
33 | + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
34 | + * USA. |
35 | + */ |
36 | + |
37 | +#ifndef XORG_VERSION_H |
38 | +#define XORG_VERSION_H |
39 | + |
40 | +#ifdef HAVE_DIX_CONFIG_H |
41 | +#include <dix-config.h> |
42 | +#endif |
43 | + |
44 | +#if XORG_VERSION_CURRENT < ((1 * 10000000) + (5 * 100000) + (99 * 1000)) |
45 | +#define XORG 15 |
46 | +#else |
47 | +#define XORG 16 |
48 | +#endif |
49 | + |
50 | +#endif |
51 | Index: unix/xserver/hw/vnc/Makefile.am |
52 | =================================================================== |
53 | --- unix/xserver/hw/vnc/Makefile.am (revision 3883) |
54 | +++ unix/xserver/hw/vnc/Makefile.am (revision 3884) |
55 | @@ -9,7 +9,7 @@ |
56 | |
57 | noinst_LTLIBRARIES = libvnccommon.la |
58 | |
59 | -HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h |
60 | +HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h |
61 | |
62 | libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc |
63 | |
64 | Index: unix/xserver/hw/vnc/XserverDesktop.cc |
65 | =================================================================== |
66 | --- unix/xserver/hw/vnc/XserverDesktop.cc (revision 3883) |
67 | +++ unix/xserver/hw/vnc/XserverDesktop.cc (revision 3884) |
68 | @@ -41,6 +41,7 @@ |
69 | #include <rfb/Configuration.h> |
70 | #include "XserverDesktop.h" |
71 | #include "vncExtInit.h" |
72 | +#include "xorg-version.h" |
73 | |
74 | extern "C" { |
75 | #define public c_public |
76 | Index: unix/xserver/hw/vnc/XserverDesktop.h |
77 | =================================================================== |
78 | --- unix/xserver/hw/vnc/XserverDesktop.h (revision 3883) |
79 | +++ unix/xserver/hw/vnc/XserverDesktop.h (revision 3884) |
80 | @@ -26,15 +26,6 @@ |
81 | #include <dix-config.h> |
82 | #endif |
83 | |
84 | -#if XORG_VERSION_CURRENT < \ |
85 | - ((1 * 10000000) + (5 * 100000) + (99 * 1000)) |
86 | -/* Xorg 1.5 branch */ |
87 | -#define XORG 15 |
88 | -#else |
89 | -/* Xorg 1.6 branch */ |
90 | -#define XORG 16 |
91 | -#endif |
92 | - |
93 | #include <rfb/SDesktop.h> |
94 | #include <rfb/HTTPServer.h> |
95 | #include <rfb/PixelBuffer.h> |
96 | Index: unix/xserver/hw/vnc/vncHooks.cc |
97 | =================================================================== |
98 | --- unix/xserver/hw/vnc/vncHooks.cc (revision 3883) |
99 | +++ unix/xserver/hw/vnc/vncHooks.cc (revision 3884) |
100 | @@ -25,6 +25,7 @@ |
101 | #include "XserverDesktop.h" |
102 | #include "vncHooks.h" |
103 | #include "vncExtInit.h" |
104 | +#include "xorg-version.h" |
105 | |
106 | extern "C" { |
107 | #define class c_class |