rpms/vnc/devel vnc-64bit.patch,NONE,1.1 vnc.spec,1.113,1.114

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8615

Modified Files:
	vnc.spec 
Added Files:
	vnc-64bit.patch 
Log Message:
* Tue Dec  6 2005 Tim Waugh <twaugh at redhat.com>
- Fix 64-bit server (bug #174702).

vnc-64bit.patch:
 XserverDesktop.h |    2 ++
 Xvnc/xvnc.cc     |   19 -------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

--- NEW FILE vnc-64bit.patch ---
--- 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: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- vnc.spec	6 Dec 2005 14:32:36 -0000	1.113
+++ vnc.spec	6 Dec 2005 14:49:10 -0000	1.114
@@ -31,6 +31,7 @@
 Patch13:   vnc-fontpath.patch
 Patch14:   vnc-s390.patch
 Patch15:   vnc-viewer-reparent.patch
+Patch16:   vnc-64bit.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -88,6 +89,7 @@
 %patch13 -p1 -b .fontpath
 %patch14 -p1 -b .s390
 %patch15 -p1 -b .viewer-reparent
+%patch16 -p1 -b .64bit
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -249,6 +251,7 @@
 
 %changelog
 * Tue Dec  6 2005 Tim Waugh <twaugh at redhat.com>
+- Fix 64-bit server (bug #174702).
 - Build requires freetype-devel.
 - Build requires libXext-devel, libXtst-devel, automake, libtool, pkgconfig,
   libfontenc-devel, xorg-x11-util-macros.