rpms/tigervnc/devel tigervnc10-rh516274.patch, NONE, 1.1 tigervnc.spec, 1.22, 1.23

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25922

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh516274.patch 
Log Message:
- create Xvnc keyboard mapping before first keypress (#516274)


tigervnc10-rh516274.patch:
 dix/main.c               |    3 +++
 hw/vnc/XserverDesktop.cc |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE tigervnc10-rh516274.patch ---
diff -up tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274 tigervnc-1.0.0/unix/xserver/dix/main.c
--- tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274	2009-10-14 13:10:14.894393124 +0200
+++ tigervnc-1.0.0/unix/xserver/dix/main.c	2009-10-14 13:10:14.904391193 +0200
@@ -125,6 +125,8 @@ extern FontPtr defaultFont;
 extern void InitProcVectors(void);
 extern Bool CreateGCperDepthArray(void);
 
+extern void workaroundRHBZ516274(void);
+
 #ifndef PANORAMIX
 static
 #endif
@@ -368,6 +370,7 @@ int main(int argc, char *argv[], char *e
         InitCoreDevices();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	workaroundRHBZ516274();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
diff -up tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274 tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc
--- tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274	2009-08-20 11:46:42.000000000 +0200
+++ tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc	2009-10-14 13:10:30.936890666 +0200
@@ -1511,3 +1511,12 @@ static int vfbMouseProc(DeviceIntPtr pDe
   }
   return Success;
 }
+
+extern "C" {
+
+void workaroundRHBZ516274(void)
+{
+  CopyKeyClass(vncKeyboardDevice, vncKeyboardDevice->u.master);
+}
+
+};


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- tigervnc.spec	8 Oct 2009 13:39:10 -0000	1.22
+++ tigervnc.spec	26 Oct 2009 14:48:15 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -42,6 +42,7 @@ Patch8:		tigervnc-viewer-reparent.patch
 Patch10:	tigervnc10-compat.patch
 Patch11:	tigervnc10-rh510185.patch
 Patch12:	tigervnc10-rh524340.patch
+Patch13:	tigervnc10-rh516274.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -107,6 +108,7 @@ popd
 %patch10 -p1 -b .compat
 %patch11 -p0 -b .rh510185
 %patch12 -p0 -b .rh524340
+%patch13 -p1 -b .rh516274
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -248,6 +250,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-3
+- create Xvnc keyboard mapping before first keypress (#516274)
+
 * Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-2
 - update underlying X source to 1.6.4-0.3.fc11
 - remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)