rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-builtin-fonts.patch, NONE, 1.1 xorg-x11-server.spec, 1.166, 1.167

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28691

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-builtin-fonts.patch 
Log Message:
* Wed Sep  6 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-36.fc6
- Enable builtin fallback versions of cursor and fixed fonts.


xorg-x11-server-1.1.1-builtin-fonts.patch:
 dixfonts.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-builtin-fonts.patch ---
--- ./dix/dixfonts.c.builtin-fonts	2006-09-06 16:45:20.000000000 -0400
+++ ./dix/dixfonts.c	2006-09-06 16:45:31.000000000 -0400
@@ -1904,9 +1904,7 @@
     } else 
 #endif
     {
-#ifdef KDRIVESERVER
 	BuiltinRegisterFpeFunctions();
-#endif
 	FontFileRegisterFpeFunctions();
 #ifndef NOFONTSERVERACCESS
 	fs_register_fpe_functions();


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- xorg-x11-server.spec	5 Sep 2006 22:07:50 -0000	1.166
+++ xorg-x11-server.spec	6 Sep 2006 20:53:31 -0000	1.167
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   35%{?dist}
+Release:   36%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -40,6 +40,7 @@
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
 Patch1004:  xorg-x11-server-1.1.1-selinux-awareness.patch
+Patch1005:  xorg-x11-server-1.1.1-builtin-fonts.patch
 
 # Backports of post-1.1 stuff.
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
@@ -703,6 +704,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Sep  6 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-36.fc6
+- Enable builtin fallback versions of cursor and fixed fonts.
+
 * Tue Sep  5 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-35.fc6
 - xorg-x11-server-1.1.1-always-mouse-thyself.patch: Fix the check to look
   for mouse/void drivers in the running layout, as opposed to the config file,