rpms/xorg-x11-server/devel xserver-1.4.99-apm-typedefs.patch, NONE, 1.1 xorg-x11-server.spec, 1.279, 1.280

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.4.99-apm-typedefs.patch 
Log Message:
* Mon Dec 03 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.12
- xserver-1.4.99-apm-typedefs.patch: Temporary hack for broken kernels that
  don't publish the /dev/apm_bios types.


xserver-1.4.99-apm-typedefs.patch:

--- NEW FILE xserver-1.4.99-apm-typedefs.patch ---
>From b9119f9e0b0166c46114f9715a8064582131ab1d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 3 Dec 2007 14:00:25 -0500
Subject: [PATCH] apm_event_t workaround

---
 hw/xfree86/os-support/linux/lnx_apm.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index 16ac80d..6bcae47 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -39,6 +39,9 @@ static PMClose lnxAPMOpen(void);
 static void lnxCloseAPM(void);
 static pointer APMihPtr = NULL;
 
+/* XXX this is wrong, do not ever commit me upstream */
+#define apm_event_t unsigned short
+
 static struct {
     apm_event_t apmLinux;
     pmEvent xf86;
-- 
1.5.2.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- xorg-x11-server.spec	28 Nov 2007 17:48:46 -0000	1.279
+++ xorg-x11-server.spec	3 Dec 2007 18:32:51 -0000	1.280
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.11%{?dist}
+Release:   0.12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -521,6 +521,10 @@
 
 
 %changelog
+* Mon Dec 03 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.12
+- xserver-1.4.99-apm-typedefs.patch: Temporary hack for broken kernels that
+  don't publish the /dev/apm_bios types.
+
 * Wed Nov 28 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.11
 - Today's rebase.
 - BR on git-core instead of git.