- rel 3; use pixman glyph

[packages/xorg-xserver-server.git] / xorg-xserver-server-less-acpi-brokenness.patch

diff --git a/xorg-xserver-server-less-acpi-brokenness.patch b/xorg-xserver-server-less-acpi-brokenness.patch
index cc80e6cef4e11713b7953651abef78fae78e7ec4..41e6ff312ec410d002555fac66c106ba8a3e8e86 100644 (file)
--- a/xorg-xserver-server-less-acpi-brokenness.patch
+++ b/xorg-xserver-server-less-acpi-brokenness.patch
@@ -1,31 +1,25 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From 392ce7dc5062416a8cf1c9a66e0dce1677f46804 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
+Date: Wed, 9 Nov 2011 11:52:06 +1000
 Subject: [PATCH] Don't build the ACPI code.
 
 No good can come of this.
 ---
- configure.ac |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ configure.ac |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
+index 63d59f9..6683005 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
-               case $host_cpu in
-                 ia64*)
-                       linux_ia64=yes
--                      linux_acpi="yes"
-                       ;;
-                 alpha*)
+@@ -1624,7 +1624,6 @@ if test "x$XORG" = xyes; then
                        linux_alpha=yes
                        ;;
-                 i*86|amd64*|x86_64*)
+                 i*86|amd64*|x86_64*|ia64*)
 -                      linux_acpi="yes"
                        ;;
                  *)
                        ;;
 -- 
-1.6.1.3
+1.7.7