- 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.
This commit is contained in:
Adam Jackson 2007-07-11 17:47:43 +00:00
parent e65fb220a7
commit 45e6942827
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,16 @@
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)

View File

@ -10,7 +10,7 @@
Summary: X.Org X11 Protocol headers Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel Name: xorg-x11-proto-devel
Version: 7.2 Version: 7.2
Release: 9%{?dist} Release: 10%{?dist}
License: MIT License: MIT
Group: Development/System Group: Development/System
URL: http://www.x.org URL: http://www.x.org
@ -57,6 +57,8 @@ Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2
Provides: xproto = 7.0.10 Provides: xproto = 7.0.10
Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2 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: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@ -78,6 +80,8 @@ X.Org X11 Protocol headers
%prep %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 %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 %build
# Proceed through each proto package directory, building them all # Proceed through each proto package directory, building them all
@ -286,6 +290,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xproxymngproto.pc %{_libdir}/pkgconfig/xproxymngproto.pc
%changelog %changelog
* Wed Jul 11 2007 Adam Jackson <ajax@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@redhat.com> 7.2-9 * Thu Apr 26 2007 Adam Jackson <ajax@redhat.com> 7.2-9
- inputproto 1.4.2 - inputproto 1.4.2