SOURCES: vnc-102434.patch (NEW), vnc-16x16.png (NEW), vnc-188169.p...
pascalek
pascalek at pld-linux.org
Wed May 2 17:15:13 CEST 2007
Author: pascalek Date: Wed May 2 15:15:13 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
SOURCES:
vnc-102434.patch (NONE -> 1.1) (NEW), vnc-16x16.png (NONE -> 1.1) (NEW), vnc-188169.patch (NONE -> 1.1) (NEW), vnc-210617.patch (NONE -> 1.1) (NEW), vnc-24x24.png (NONE -> 1.1) (NEW), vnc-48x48.png (NONE -> 1.1) (NEW), vnc-64bit.patch (NONE -> 1.1) (NEW), vnc-build.patch (NONE -> 1.1) (NEW), vnc-config.patch (NONE -> 1.1) (NEW), vnc-cookie.patch (NONE -> 1.1) (NEW), vnc-def.patch (NONE -> 1.1) (NEW), vnc-fontpath.patch (NONE -> 1.1) (NEW), vnc-fPIC.patch (NONE -> 1.1) (NEW), vnc-gcc4.patch (NONE -> 1.1) (NEW), vnc-idle.patch (NONE -> 1.1) (NEW), vnc-modular-xorg.patch (NONE -> 1.1) (NEW), vnc-newfbsize.patch (NONE -> 1.1) (NEW), vnc-nohttpd.patch (NONE -> 1.1) (NEW), vnc-null-interface.patch (NONE -> 1.1) (NEW), vnc-opengl.patch (NONE -> 1.1) (NEW), vnc-ppc64.patch (NONE -> 1.1) (NEW), vnc-render.patch (NONE -> 1.1) (NEW), vnc-restart.patch (NONE -> 1.1) (NEW), vnc-s390.patch (NONE -> 1.1) (NEW), vnc-select.patch (NONE -> 1.1) (NEW), vncserver.init
(NONE -> 1.1) (NEW), vncserver.sysconfig (NONE -> 1.1) (NEW), vnc-use-fb.patch (NONE -> 1.1) (NEW), vnc-via.patch (NONE -> 1.1) (NEW), vnc-viewer-reparent.patch (NONE -> 1.1) (NEW), vnc-vncpasswd.patch (NONE -> 1.1) (NEW), vnc-xclients.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/vnc-102434.patch
diff -u /dev/null SOURCES/vnc-102434.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-102434.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,61 @@
+--- vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx 2006-12-01 13:37:27.000000000 +0100
+@@ -52,6 +52,7 @@
+ "manager decoration around a window", 24);
+ StringParameter passwordFile("PasswordFile",
+ "Password file for VNC authentication", "");
++BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
+ AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
+
+ BoolParameter useLocalCursor("UseLocalCursor",
+--- vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man 2006-12-01 13:37:27.000000000 +0100
+@@ -108,6 +108,11 @@
+ "~/.vnc/passwd".
+
+ .TP
++.B \-passwdInput \fItrue, false\fP
++Force standard vnc dialog to getting password and reads password from stdin.
++Default is false(shows dialog window)
++
++.TP
+ .B \-Shared
+ When you make a connection to a VNC server, all other existing connections are
+ normally closed. This option requests that they be left open, allowing you to
+--- vnc-4_1_2-unixsrc/unix/vncviewer/parameters.h.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/parameters.h 2006-12-01 13:37:27.000000000 +0100
+@@ -38,6 +38,7 @@
+ extern rfb::BoolParameter fullScreen;
+ extern rfb::StringParameter geometry;
+ extern rfb::StringParameter embedParent;
++extern rfb::BoolParameter passwdInput;
+
+ extern char aboutText[];
+ extern char* programName;
+--- vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-12-01 13:41:42.000000000 +0100
+@@ -37,6 +37,8 @@
+ #include "ServerDialog.h"
+ #include "PasswdDialog.h"
+ #include "parameters.h"
++#include <string>
++#include <iostream>
+
+ using namespace rfb;
+
+@@ -206,6 +208,15 @@
+ return;
+ }
+
++ if(passwdInput)
++ {
++ std::string s;
++ std::cin >> s;
++ *password = strdup(s.c_str());
++ if(user) *user = 0;
++ return;
++ }
++
+ const char* secType = secTypeName(getCurrentCSecurity()->getType());
+ const char* titlePrefix = "VNC Authentication";
+ CharArray title(strlen(titlePrefix) + strlen(secType) + 4);
================================================================
Index: SOURCES/vnc-16x16.png
<<Binary file>>
================================================================
Index: SOURCES/vnc-188169.patch
diff -u /dev/null SOURCES/vnc-188169.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-188169.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,53 @@
+--- vnc-4_1_2-unixsrc/unix/vncviewer/DesktopWindow.cxx.fix 2006-05-15 18:56:20.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/vncviewer/DesktopWindow.cxx 2006-11-03 15:32:55.000000000 +0100
+@@ -370,9 +370,13 @@
+ break;
+
+ case ButtonPress:
++ if(ev->xkey.state & ControlMask)
++ cc->writer()->keyEvent(XK_Control_L, true);
+ handlePointerEvent(Point(ev->xbutton.x, ev->xbutton.y),
+ (((ev->xbutton.state & 0x1f00) >> 8) |
+ (1 << (ev->xbutton.button-1))));
++ if(ev->xkey.state & ControlMask)
++ cc->writer()->keyEvent(XK_Control_L, false);
+ break;
+
+ case ButtonRelease:
+@@ -387,6 +391,16 @@
+ char keyname[256];
+ XLookupString(&ev->xkey, keyname, 256, &ks, NULL);
+ bool fakeShiftPress = false;
++ bool ctrlPressed = false;
++
++ if((ks == XK_Control_L) || (ks == XK_Control_R))
++ break;
++
++ if(ev->xkey.state & ControlMask)
++ {
++ ctrlPressed = true;
++ cc->writer()->keyEvent(XK_Control_L, true);
++ }
+
+ // Turn ISO_Left_Tab into shifted Tab
+ if (ks == XK_ISO_Left_Tab) {
+@@ -402,11 +416,19 @@
+
+ if (fakeShiftPress)
+ cc->writer()->keyEvent(XK_Shift_L, false);
++ if(ctrlPressed)
++ cc->writer()->keyEvent(XK_Control_L, false);
+ break;
+ }
+
+ case KeyRelease:
+ if (!viewOnly) {
++ KeySym ks;
++ char keyname[256];
++ XLookupString(&ev->xkey, keyname, 256, &ks, NULL);
++ if((ks == XK_Control_L) || (ks == XK_Control_L))
++ break;
++
+ if (downKeysym[ev->xkey.keycode]) {
+ cc->writer()->keyEvent(downKeysym[ev->xkey.keycode], false);
+ downKeysym[ev->xkey.keycode] = 0;
================================================================
Index: SOURCES/vnc-210617.patch
diff -u /dev/null SOURCES/vnc-210617.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-210617.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,67 @@
+--- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.ipv6 2006-10-13 11:31:37.000000000 +0100
++++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2006-10-13 12:05:40.000000000 +0100
+@@ -106,11 +106,29 @@
+ TcpSocket::TcpSocket(const char *host, int port)
+ : closeFd(true)
+ {
++ struct sockaddr_storage addr;
++ size_t addrlen;
++ struct addrinfo *hostai;
+ int sock;
+
+- // - Create a socket
+ initSockets();
+- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
++
++ if (getaddrinfo(host, NULL, NULL, &hostai)) {
++ int e = errorNumber;
++ throw SocketException("unable to resolve host by name", e);
++ }
++
++ addrlen = hostai->ai_addrlen;
++ memset(&addr, 0, sizeof(addr));
++ memcpy(&addr, hostai->ai_addr, addrlen);
++ freeaddrinfo(hostai);
++ if (addr.ss_family == AF_INET)
++ ((struct sockaddr_in *)&addr)->sin_port = htons(port);
++ else if (addr.ss_family == AF_INET6)
++ ((struct sockaddr_in6 *)&addr)->sin6_port = htons(port);
++
++ // - Create a socket
++ if ((sock = socket(addr.ss_family, SOCK_STREAM, 0)) < 0)
+ throw SocketException("unable to create socket", errorNumber);
+
+ #ifndef WIN32
+@@ -118,30 +136,9 @@
+ fcntl(sock, F_SETFD, FD_CLOEXEC);
+ #endif
+
+- // - Connect it to something
+-
+- // Try processing the host as an IP address
+- struct sockaddr_in addr;
+- memset(&addr, 0, sizeof(addr));
+- addr.sin_family = AF_INET;
+- addr.sin_addr.s_addr = inet_addr(host);
+- addr.sin_port = htons(port);
+- if ((int)addr.sin_addr.s_addr == -1) {
+- // Host was not an IP address - try resolving as DNS name
+- struct hostent *hostinfo;
+- hostinfo = gethostbyname(host);
+- if (hostinfo && hostinfo->h_addr) {
+- addr.sin_addr.s_addr = ((struct in_addr *)hostinfo->h_addr)->s_addr;
+- } else {
+- int e = errorNumber;
+- closesocket(sock);
+- throw SocketException("unable to resolve host by name", e);
+- }
+- }
+-
+ // Attempt to connect to the remote host
+ for (;;) {
+- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
++ if (connect(sock, (struct sockaddr *)&addr, addrlen) != 0) {
+ int e = errorNumber;
+ if (e == EINTR)
+ continue;
+
================================================================
Index: SOURCES/vnc-24x24.png
<<Binary file>>
================================================================
Index: SOURCES/vnc-48x48.png
<<Binary file>>
================================================================
Index: SOURCES/vnc-64bit.patch
diff -u /dev/null SOURCES/vnc-64bit.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-64bit.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,39 @@
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.h.64bit 2005-03-11 15:08:41.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.h 2005-12-06 14:31:11.000000000 +0000
+@@ -29,6 +29,8 @@
+ #include <rfb/VNCServerST.h>
+ #include <rdr/SubstitutingInStream.h>
+
++#include "xorg-server.h"
++
+ extern "C" {
+ #define class c_class;
+ #include <scrnintstr.h>
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.64bit 2005-12-06 14:31:24.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-12-06 14:31:30.000000000 +0000
+@@ -973,25 +973,6 @@
+
+ } /* end InitOutput */
+
+-#ifdef DPMSExtension
+-extern "C" {
+-#if NeedFunctionPrototypes
+- void DPMSSet(CARD16 level)
+-#else
+- void DPMSSet(level)
+- CARD16 level;
+-#endif
+- {
+- return;
+- }
+-
+- Bool DPMSSupported()
+- {
+- return FALSE;
+- }
+-}
+-#endif
+-
+ /* this is just to get the server to link on AIX */
+ #ifdef AIXV3
+ int SelectWaitTime = 10000; /* usec */
================================================================
Index: SOURCES/vnc-build.patch
diff -u /dev/null SOURCES/vnc-build.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-build.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,21 @@
+reverted:
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2005-03-10 14:51:39.000000000 +0000
++++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2004-12-01 17:27:58.000000000 +0000
+@@ -48,7 +48,7 @@
+ * Make sure XINPUT, XF86VidTune, etc arent defined for the miinitext.o
+ * used by Xvnc
+ */
++EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
+-EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
+ #endif
+
+
+@@ -70,7 +70,7 @@
+ SpecialCplusplusObjectRule(xvnc,$(ICONFIGFILES) xvnc,$(EXT_DEFINES) $(NO_OPERATOR_NAMES))
+
+ LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
++SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER)
+-SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER)
+
+ /* InstallManPage(Xvfb,$(MANDIR)) */
+ DependTarget()
================================================================
Index: SOURCES/vnc-config.patch
diff -u /dev/null SOURCES/vnc-config.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-config.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,18 @@
+--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.config 2006-10-25 12:35:00.000000000 +0200
++++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc 2006-10-25 12:35:24.000000000 +0200
+@@ -17,6 +17,7 @@
+ */
+
+ #include <stdio.h>
++#include "XserverDesktop.h"
+
+ extern "C" {
+ #define class c_class
+@@ -48,7 +49,6 @@
+ #undef min
+ #include <network/TcpSocket.h>
+
+-#include "XserverDesktop.h"
+ #include "vncHooks.h"
+ #include "vncExtInit.h"
+
================================================================
Index: SOURCES/vnc-cookie.patch
diff -u /dev/null SOURCES/vnc-cookie.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-cookie.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,27 @@
+--- vnc-4_1-unixsrc/unix/vncserver.cookie 2005-02-23 12:28:18.000000000 +0000
++++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 22:04:28.000000000 +0000
+@@ -116,18 +116,12 @@
+ $desktopLog = "$vncUserDir/$host:$displayNumber.log";
+ unlink($desktopLog);
+
+-# Make an X server cookie - use as the seed the sum of the current time, our
+-# PID and part of the encrypted form of the password. Ideally we'd use
+-# /dev/urandom, but that's only available on Linux.
+-
+-srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
+-$cookie = "";
+-for (1..16) {
+- $cookie .= sprintf("%02x", int(rand(256)) % 256);
+-}
+-
+-system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
+-system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
++# Make an X server cookie - use mcookie
++$cookie = `/usr/bin/mcookie`;
++open (XAUTH, "|xauth -f $xauthorityFile source -");
++print XAUTH "add $host:$displayNumber . $cookie\n";
++print XAUTH "add $host/unix:$displayNumber . $cookie\n";
++close XAUTH;
+
+ if ($opt{'-name'}) {
+ $desktopName = $opt{'-name'};
================================================================
Index: SOURCES/vnc-def.patch
diff -u /dev/null SOURCES/vnc-def.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-def.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,12 @@
+--- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in.def 2003-07-07 10:51:22.000000000 +0100
++++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in 2004-05-27 13:24:02.489007854 +0100
+@@ -6,7 +6,8 @@
+ #define BuildNls NO
+ #define BuildXIE NO
+ #define BuildGlxExt NO
+-#define XnestServer NO
++#define XnestServer YES
++#define XF86Server NO
+ #define XprtServer NO
+
+ #ifdef SunArchitecture
================================================================
Index: SOURCES/vnc-fontpath.patch
diff -u /dev/null SOURCES/vnc-fontpath.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-fontpath.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,14 @@
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.fontpath 2005-12-21 11:14:58.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-12-21 11:16:56.000000000 +0000
+@@ -339,9 +339,9 @@
+ AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
+ [ MESA_SOURCE="$withval" ],
+ [ MESA_SOURCE="" ])
+-AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
++AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${datadir}/X11/fonts)]),
+ [ FONTDIR="$withval" ],
+- [ FONTDIR="${libdir}/X11/fonts" ])
++ [ FONTDIR="${datadir}/X11/fonts" ])
+ DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ [ FONTPATH="$withval" ],
================================================================
Index: SOURCES/vnc-fPIC.patch
diff -u /dev/null SOURCES/vnc-fPIC.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-fPIC.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,89 @@
+--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.fPIC 2005-03-04 14:33:47.000000000 +0000
++++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2005-03-04 14:34:16.000000000 +0000
+@@ -21,7 +21,8 @@
+ LinkSourceFile(xf86vncModule.cc,..)
+ LinkSourceFile(XserverDesktop.cc,..)
+
+-ModuleObjectRule()
++.CCsuf.Osuf:
++ NormalSharedLibObjCplusplusCompile($(_NOOP_))
+ /*
+ LibraryModuleTarget(vnc,$(OBJS) $(VNCLIBS))
+ InstallLibraryModule(vnc,$(MODULEDIR),extensions)
+--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.fPIC 2005-03-04 14:34:24.000000000 +0000
++++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2005-03-04 14:34:52.000000000 +0000
+@@ -36,8 +36,8 @@
+ NormalLintTarget($(SRCS))
+
+ NormalLibraryObjectRule()
+-NormalCplusplusObjectRule()
+-
++.CCsuf.Osuf:
++ NormalSharedLibObjCplusplusCompile($(_NOOP_))
+
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+--- vnc-4_1-unixsrc/unix/boilerplate.mk.fPIC 2005-03-04 14:35:03.000000000 +0000
++++ vnc-4_1-unixsrc/unix/boilerplate.mk 2005-03-04 14:35:23.000000000 +0000
+@@ -15,7 +15,7 @@
+ CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
+ CCLD = $(CC)
+ CXX = @CXX@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
+ CXXLD = $(CXX)
+ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
+--- vnc-4_1-unixsrc/common/Xregion/Makefile.in.fPIC 2005-03-04 14:32:24.000000000 +0000
++++ vnc-4_1-unixsrc/common/Xregion/Makefile.in 2005-03-04 14:32:36.000000000 +0000
+@@ -12,4 +12,5 @@
+ $(AR) $(library) $(OBJS)
+ $(RANLIB) $(library)
+
++DIR_CFLAGS = -DPIC -fPIC
+ # followed by boilerplate.mk
+--- vnc-4_1-unixsrc/common/network/Makefile.in.fPIC 2005-03-04 14:32:44.000000000 +0000
++++ vnc-4_1-unixsrc/common/network/Makefile.in 2005-03-04 14:32:58.000000000 +0000
+@@ -14,4 +14,5 @@
+ $(AR) $(library) $(OBJS)
+ $(RANLIB) $(library)
+
++DIR_CXXFLAGS = -DPIC -fPIC
+ # followed by boilerplate.mk
+--- vnc-4_1-unixsrc/common/rdr/Makefile.in.fPIC 2005-03-04 14:33:05.000000000 +0000
++++ vnc-4_1-unixsrc/common/rdr/Makefile.in 2005-03-04 14:33:16.000000000 +0000
+@@ -16,4 +16,5 @@
+ $(AR) $(library) $(OBJS)
+ $(RANLIB) $(library)
+
++DIR_CXXFLAGS = -DPIC -fPIC
+ # followed by boilerplate.mk
+--- vnc-4_1-unixsrc/common/rfb/Makefile.in.fPIC 2005-03-04 14:33:20.000000000 +0000
++++ vnc-4_1-unixsrc/common/rfb/Makefile.in 2005-03-04 14:33:33.000000000 +0000
+@@ -65,4 +65,6 @@
+ $(AR) $(library) $(OBJS)
+ $(RANLIB) $(library)
+
++DIR_CFLAGS = -DPIC -fPIC
++DIR_CXXFLAGS = -DPIC -fPIC
+ # followed by boilerplate.mk
+--- vnc-4_1-unixsrc/common/Makefile.in.fPIC 2005-03-04 15:08:57.000000000 +0000
++++ vnc-4_1-unixsrc/common/Makefile.in 2005-03-04 15:09:25.000000000 +0000
+@@ -1,4 +1,6 @@
+
+ SUBDIRS = @ZLIB_DIR@ rdr network Xregion rfb
+
++DIR_CFLAGS = -DPIC -fPIC
++DIR_CXXFLAGS = -DPIC -fPIC
+ # followed by boilerplate.mk
+--- vnc-4_1-unixsrc/common/boilerplate.mk.fPIC 2005-03-04 15:09:32.000000000 +0000
++++ vnc-4_1-unixsrc/common/boilerplate.mk 2005-03-04 15:09:49.000000000 +0000
+@@ -15,7 +15,7 @@
+ CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
+ CCLD = $(CC)
+ CXX = @CXX@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
+ CXXLD = $(CXX)
+ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
================================================================
Index: SOURCES/vnc-gcc4.patch
diff -u /dev/null SOURCES/vnc-gcc4.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-gcc4.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,11 @@
+--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.gcc4 2005-03-04 13:52:03.000000000 +0000
++++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc 2005-03-04 13:52:24.000000000 +0000
+@@ -751,7 +751,7 @@
+ rep.timeout = qcTimeout;
+ rep.addrLen = qcTimeout ? strlen(qcAddress) : 0;
+ rep.userLen = qcTimeout ? strlen(qcUsername) : 0;
+- rep.opaqueId = (CARD32)queryConnectId;
++ rep.opaqueId = (CARD32)(long)queryConnectId;
+ rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber, n);
================================================================
Index: SOURCES/vnc-idle.patch
diff -u /dev/null SOURCES/vnc-idle.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-idle.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,11 @@
+--- vnc-4_1-unixsrc/common/rfb/ServerCore.cxx.idle 2005-03-03 15:42:21.000000000 +0000
++++ vnc-4_1-unixsrc/common/rfb/ServerCore.cxx 2005-03-03 23:11:14.000000000 +0000
+@@ -29,7 +29,7 @@
+ ("IdleTimeout",
+ "The number of seconds after which an idle VNC connection will be dropped "
+ "(zero means no timeout)",
+- 3600, 0);
++ 0, 0);
+ rfb::IntParameter rfb::Server::clientWaitTimeMillis
+ ("ClientWaitTimeMillis",
+ "The number of milliseconds to wait for a client which is no longer "
================================================================
Index: SOURCES/vnc-modular-xorg.patch
diff -u /dev/null SOURCES/vnc-modular-xorg.patch:1.1
--- /dev/null Wed May 2 17:15:13 2007
+++ SOURCES/vnc-modular-xorg.patch Wed May 2 17:15:08 2007
@@ -0,0 +1,202 @@
+--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2006-06-13 17:47:02.000000000 -0400
++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2006-06-13 17:47:02.000000000 -0400
+@@ -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;
+--- /dev/null 2006-06-13 10:12:45.634275750 -0400
++++ vnc-4_1_2-unixsrc/unix/xorg-server/hw/vnc/Makefile.am 2006-06-13 17:47:02.000000000 -0400
+@@ -0,0 +1,85 @@
++noinst_LTLIBRARIES = libvnccommon.la
++libvnccommon_la_SOURCES = \
++ RegionHelper.h \
++ vncExtInit.cc \
++ vncExtInit.h \
++ vncHooks.cc \
++ vncHooks.h \
++ XserverDesktop.cc \
++ XserverDesktop.h
++
++libvnccommon_la_CXXFLAGS = \
++ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
++ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
++ -DGC_HAS_COMPOSITE_CLIP \
++ -DVNC_USE_FB \
++ -I/usr/include/X11 \
++ -I../../../../common \
++ -I../../../vncconfig
++
++bin_PROGRAMS = Xvnc
++
++Xvnc_SOURCES = \
++ xvnc.cc \
++ $(top_srcdir)/Xext/dpmsstubs.c \
++ $(top_srcdir)/Xi/stubs.c \
++ $(top_srcdir)/mi/miinitext.c \
++ $(top_srcdir)/fb/fbcmap.c
++
++Xvnc_LDADD = $(XORG_CORE_LIBS) \
++ $(XORG_LIBS) \
++ $(XSERVER_LIBS) \
++ ../../fb/libfb.la \
++ ../../mi/libminimi.la \
++ ../../render/librender.la \
++ ../../xkb/libxkbstubs.la \
++ ../../dbe/libdbe.la \
++ ../../Xext/libXext.la \
++ ../../XTrap/libxtrap.la \
++ ../../record/librecord.la \
++ ../xfree86/os-support/libxorgos.la \
++ ../../os/libos.la \
++ ../xfree86/common/libcommon.la \
++ -lX11 \
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list