rpms/xorg-x11-proto-devel/devel inputproto-1.4.2-horrible-header-hack.patch, NONE, 1.1 xorg-x11-proto-devel.spec, 1.56, 1.57

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6659

Modified Files:
	xorg-x11-proto-devel.spec 
Added Files:
	inputproto-1.4.2-horrible-header-hack.patch 
Log Message:
* Wed Jul 11 2007 Adam Jackson <ajax at redhat.com> 7.2-10
- inputproto-1.4.2-horrible-header-hack.patch: Re-add some #defines from
  older inputproto to make old drivers build.  Do not commit this patch
  upstream.


inputproto-1.4.2-horrible-header-hack.patch:

--- NEW FILE inputproto-1.4.2-horrible-header-hack.patch ---
diff -up xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h.jx xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h
--- xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h.jx	2007-04-24 08:40:11.000000000 -0400
+++ xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h	2007-07-11 13:19:40.000000000 -0400
@@ -215,6 +215,12 @@ SOFTWARE.
 #define Relative                0
 #define Absolute                1
 
+/* XXX these don't belong here, they're not part of the protocol */
+#define TS_Raw                                 57
+#define TS_Scaled                              58
+#define SendCoreEvents                 59
+#define DontSendCoreEvents             60
+
 #define ProximityState          (1L << 1)
 #define InProximity             (0L << 1)
 #define OutOfProximity          (1L << 1)


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xorg-x11-proto-devel.spec	26 Apr 2007 18:41:26 -0000	1.56
+++ xorg-x11-proto-devel.spec	11 Jul 2007 17:47:43 -0000	1.57
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -57,6 +57,8 @@
 Provides: xproto = 7.0.10
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
+Patch0: inputproto-1.4.2-horrible-header-hack.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -78,6 +80,8 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
+%patch0 -p1 -b .hhh
+
 %build
 
 # Proceed through each proto package directory, building them all
@@ -286,6 +290,11 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Jul 11 2007 Adam Jackson <ajax at redhat.com> 7.2-10
+- inputproto-1.4.2-horrible-header-hack.patch: Re-add some #defines from
+  older inputproto to make old drivers build.  Do not commit this patch
+  upstream.
+
 * Thu Apr 26 2007 Adam Jackson <ajax at redhat.com> 7.2-9
 - inputproto 1.4.2