rpms/tigervnc/devel tigervnc-xorg25909.patch, NONE, 1.1 tigervnc.spec, 1.25, 1.26

[Adam Tkac]

Author: atkac

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

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc-xorg25909.patch 
Log Message:
- add patch for upstream X.Org issue #25909
- add libXdmcp-devel to build requires to build Xvnc with XDMCP support (#552322)


tigervnc-xorg25909.patch:
 eventstr.h |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE tigervnc-xorg25909.patch ---
>From 9f48f109872798c70d0215a0c67e4c6462803ee7 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac at redhat.com>
Date: Mon, 21 Dec 2009 15:03:30 +0100
Subject: [PATCH] Do not define members of include/eventstr.h:EventType enum conditionally. It can
 break modules which are built in-tree.

---
 include/eventstr.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/include/eventstr.h b/include/eventstr.h
index 0d5b1c6..79685c1 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -58,17 +58,13 @@ enum EventType {
     ET_ProximityOut,
     ET_DeviceChanged,
     ET_Hierarchy,
-#if XFreeXDGA
     ET_DGAEvent,
-#endif
     ET_RawKeyPress,
     ET_RawKeyRelease,
     ET_RawButtonPress,
     ET_RawButtonRelease,
     ET_RawMotion,
-#ifdef XQUARTZ
     ET_XQuartz,
-#endif
     ET_Internal = 0xFF /* First byte */
 };
 
-- 
1.6.5.5



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- tigervnc.spec	21 Dec 2009 16:19:46 -0000	1.25
+++ tigervnc.spec	7 Jan 2010 14:57:48 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.1.%{snap}%{?dist}
+Release:	0.2.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -22,7 +22,7 @@ BuildRequires:	xorg-x11-xtrans-devel, xo
 BuildRequires:	libdrm-devel, libXt-devel, pixman-devel libXfont-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
 BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
-BuildRequires:  freetype-devel
+BuildRequires:  freetype-devel, libXdmcp-devel
 BuildRequires:	desktop-file-utils
 
 %ifarch %ix86 x86_64
@@ -41,6 +41,8 @@ Obsoletes:	tightvnc < 1.5.0-0.15.2009020
 Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=25909
+Patch9:		tigervnc-xorg25909.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -101,6 +103,9 @@ popd
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
+pushd unix/xserver/
+%patch9 -p1 -b .xorg25909
+popd
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -237,6 +242,10 @@ fi
 %endif
 
 %changelog
+* Thu Jan 07 2010 Adam Tkac <atkac redhat com> 1.0.90-0.2.20091221svn3929
+- add patch for upstream X.Org issue #25909
+- add libXdmcp-devel to build requires to build Xvnc with XDMCP support (#552322)
+
 * Mon Dec 21 2009 Adam Tkac <atkac redhat com> 1.0.90-0.1.20091221svn3929
 - update to 1.0.90 snapshot
 - patches merged