From 39902507da4f365da361385ff1e649e9e3003dc7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Oct 14 2008 17:03:20 +0000
Subject: * Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-3

- xserver-1.5.2-backtrace-defines.patch: Get HAVE_BACKTRACE defined even at
  the DIX level.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6a591dc..2289f41 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -84,6 +84,7 @@ Patch6003: xserver-1.5.1-mode-debug.patch
 
 Patch6004: xserver-1.5.1-global-backtrace.patch
 Patch6005: xserver-1.5.2-mieq-backtrace.patch
+Patch6006: xserver-1.5.2-backtrace-defines.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -515,6 +516,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-3
+- xserver-1.5.2-backtrace-defines.patch: Get HAVE_BACKTRACE defined even at
+  the DIX level.
+
 * Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-2
 - xserver-1.5.1-global-backtrace.patch: Make backtraces possible from
   outside the xfree86 DDX.
diff --git a/xserver-1.5.2-backtrace-defines.patch b/xserver-1.5.2-backtrace-defines.patch
new file mode 100644
index 0000000..f10b3c1
--- /dev/null
+++ b/xserver-1.5.2-backtrace-defines.patch
@@ -0,0 +1,36 @@
+From ad677238bc96a8578113bbe76d605d7a87aca44c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 14 Oct 2008 13:00:50 -0400
+Subject: [PATCH] Add backtrace definitions to dix-config.h.in
+
+---
+ include/dix-config.h.in |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/include/dix-config.h.in b/include/dix-config.h.in
+index 26f4b6a..6c3d91c 100644
+--- a/include/dix-config.h.in
++++ b/include/dix-config.h.in
+@@ -75,6 +75,9 @@
+ /* Define to 1 if you have the <asm/mtrr.h> header file. */
+ #undef HAVE_ASM_MTRR_H
+ 
++/* Has backtrace support */
++#undef HAVE_BACKTRACE
++
+ /* Define to 1 if you have the <byteswap.h> header file. */
+ #undef HAVE_BYTESWAP_H
+ 
+@@ -94,6 +97,9 @@
+ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+ #undef HAVE_DOPRNT
+ 
++/* Have execinfo.h */
++#undef HAVE_EXECINFO_H
++
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+ 
+-- 
+1.6.0.1
+