diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 79bb380..5fad5af 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.99.903 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -95,6 +95,7 @@ Patch6015: xserver-1.5.99.902-vnc.patch Patch6017: xserver-1.5.99.902-nouveau.patch Patch6018: xserver-1.5.99.903-glx-visual-score.patch +Patch6019: xserver-1.5.99.903-fontmod.h %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -512,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 18 2009 Adam Jackson 1.5.99.903-3 +- xserver-1.5.99.903-fontmod.h: Fix build against new libXfont. + * Wed Feb 18 2009 Adam Jackson 1.5.99.903-2 - xserver-1.5.99.903-glx-visual-score.patch: Fix visual scoring. diff --git a/xserver-1.5.99.903-fontmod.h b/xserver-1.5.99.903-fontmod.h new file mode 100644 index 0000000..89adb0a --- /dev/null +++ b/xserver-1.5.99.903-fontmod.h @@ -0,0 +1,24 @@ +From 24a1f522d52d9cf5720dad28107bea33e623fd7b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 18 Feb 2009 15:33:14 -0500 +Subject: [PATCH] uninclude fontmod.h + +--- + hw/xfree86/loader/loaderProcs.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h +index 827f3a9..a10f0b3 100644 +--- a/hw/xfree86/loader/loaderProcs.h ++++ b/hw/xfree86/loader/loaderProcs.h +@@ -56,7 +56,6 @@ + #undef IN_LOADER + #define IN_LOADER + #include "xf86Module.h" +-#include + + typedef struct module_desc { + struct module_desc *child; +-- +1.6.1.3 +