rpms/xorg-x11-proto-devel
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- inputproto-1.4.3-card32-sucks.patch: Unbreak qt build. (#436703)

Browse Source
This commit is contained in:
Adam Jackson 2008-04-01 19:58:12 +00:00
parent a111262d58
commit 73941f5cd9
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
inputproto-1.4.3-card32-sucks.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up inputproto-1.4.3/XI.h.jx inputproto-1.4.3/XI.h
--- inputproto-1.4.3/XI.h.jx 2008-03-05 22:05:38.000000000 -0500
+++ inputproto-1.4.3/XI.h 2008-04-01 15:53:46.000000000 -0400
@@ -52,8 +52,6 @@ SOFTWARE.
#ifndef _XI_H_
#define _XI_H_
-#include <X11/Xmd.h> /* CARD32 */
-
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32
#define sz_xListInputDevicesReq 4
@@ -268,7 +266,7 @@ SOFTWARE.
* See the top of X.h for more _XSERVER64 magic.
*/
#ifdef _XSERVER64
-typedef CARD32 XEventClass;
+typedef unsigned int XEventClass;
#else
typedef unsigned long XEventClass;
#endif

8
xorg-x11-proto-devel.spec
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.3 Version: 7.3
Release: 10%{?dist} Release: 11%{?dist}
License: MIT License: MIT
Group: Development/System Group: Development/System
URL: http://www.x.org URL: http://www.x.org
@ -61,6 +61,8 @@ Provides: xproto = 7.0.12
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
Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-1.0.0.tar.bz2 Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-1.0.0.tar.bz2
Patch0: inputproto-1.4.3-card32-sucks.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@ -82,6 +84,7 @@ 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 -a31 %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 -a31
%patch0 -p0 -b .card32
%build %build
@ -297,6 +300,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/xproxymngproto.pc %{_datadir}/pkgconfig/xproxymngproto.pc
%changelog %changelog
* Tue Apr 01 2008 Adam Jackson <ajax@redhat.com> 7.3-11
- inputproto-1.4.3-card32-sucks.patch: Unbreak qt build. (#436703)
* Tue Apr 1 2008 Kristian Høgsberg <krh@redhat.com> - 7.3-10 * Tue Apr 1 2008 Kristian Høgsberg <krh@redhat.com> - 7.3-10
- Update to xf86driproto 2.0.4. - Update to xf86driproto 2.0.4.