af923f9b17
- don't build java viewer (problems due new gcj)
- use xorg codebase from xorg-x11-server-source package again
- vnc-selection.patch - new xserver selection API/ABI
- vnc-xkb.patch - disable XKEYBOARD extension
- vnc-paint.patch - PaintWindow{Background,Border} hooks have been removed
- vnc-privates.patch - update devPrivates handling
- vnc-mieq.patch - use event queue to handle input events
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100
|
|
+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100
|
|
@@ -36,8 +36,6 @@
|
|
extern "C" {
|
|
#define class c_class
|
|
#define public c_public
|
|
-#define xor c_xor
|
|
-#define and c_and
|
|
#ifdef WIN32
|
|
#include <X11/Xwinsock.h>
|
|
#endif
|
|
@@ -72,11 +70,8 @@
|
|
#include "inputstr.h"
|
|
#include "keysym.h"
|
|
extern int defaultColorVisualClass;
|
|
- extern char buildtime[];
|
|
#undef class
|
|
#undef public
|
|
-#undef xor
|
|
-#undef and
|
|
#ifndef VNC_USE_FB
|
|
extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
|
|
extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
|
|
@@ -221,7 +216,7 @@
|
|
|
|
void ddxUseMsg()
|
|
{
|
|
- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
|
|
+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
|
|
ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
|
|
VENDOR_STRING);
|
|
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
|
|
@@ -927,7 +922,7 @@
|
|
|
|
void InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
|
|
{
|
|
- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
|
|
+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
|
|
ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
|
|
VENDOR_STRING);
|
|
wellKnownSocketsCreated = true;
|