[PATCH] xfree86: Font modules aren't a real thing

[Adam Jackson]

There are no longer any loadable font modules (not that they ever did
much in the first place), so stop pretending they're a defined ABI
surface.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/common/xf86Module.h |    3 ---
 hw/xfree86/doc/ddxDesign.xml   |    6 ------
 hw/xfree86/loader/loader.c     |    1 -
 hw/xfree86/loader/loadmod.c    |    3 ---
 4 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 31f5c6a..79f8d90 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -64,7 +64,6 @@ typedef enum {
 #define ABI_CLASS_VIDEODRV	"X.Org Video Driver"
 #define ABI_CLASS_XINPUT	"X.Org XInput driver"
 #define ABI_CLASS_EXTENSION	"X.Org Server Extension"
-#define ABI_CLASS_FONT		"X.Org Font Renderer"
 
 #define ABI_MINOR_MASK		0x0000FFFF
 #define ABI_MAJOR_MASK		0xFFFF0000
@@ -85,7 +84,6 @@ typedef enum {
 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(12, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(17, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(6, 0)
-#define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1	0xef23fdc5
 #define MODINFOSTRING2	0x10dc023a
@@ -124,7 +122,6 @@ typedef enum {
 #define MOD_CLASS_NONE		NULL
 #define MOD_CLASS_VIDEODRV	"X.Org Video Driver"
 #define MOD_CLASS_XINPUT	"X.Org XInput Driver"
-#define MOD_CLASS_FONT		"X.Org Font Renderer"
 #define MOD_CLASS_EXTENSION	"X.Org Server Extension"
 
 /* This structure is expected to be returned by the initfunc */
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index ca5efc9..e8d2338 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -5645,10 +5645,6 @@ The fields are used as follows:
 		    <term><constant>ABI_CLASS_EXTENSION</constant></term>
 		    <listitem><para>requires the extension module ABI
 		      </para></listitem></varlistentry>
-		  <varlistentry>
-		    <term><constant>ABI_CLASS_FONT</constant></term>
-		    <listitem><para>requires the font module ABI
-		      </para></listitem></varlistentry>
 		</variablelist>
 
 	      </para></listitem></varlistentry>
@@ -5668,7 +5664,6 @@ The fields are used as follows:
                    ABI_VIDEODRV_VERSION
                    ABI_XINPUT_VERSION
                    ABI_EXTENSION_VERSION
-                   ABI_FONT_VERSION
 		  </constant></literallayout>
 
 	      </para></listitem></varlistentry>
@@ -5688,7 +5683,6 @@ The fields are used as follows:
                    MOD_CLASS_NONE
                    MOD_CLASS_VIDEODRV
                    MOD_CLASS_XINPUT
-                   MOD_CLASS_FONT
                    MOD_CLASS_EXTENSION
 		  </constant></literallayout>
 
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index b72b8b8..fcc5ff1 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -194,7 +194,6 @@ LoaderGetABIVersion(const char *abiclass)
         ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion}, {
         ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion}, {
         ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion}, {
-        ABI_CLASS_FONT, LoaderVersionInfo.fontVersion}, {
         NULL, 0}
     };
     int i;
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 706b9b3..e10d7d1 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -90,7 +90,6 @@ const ModuleVersions LoaderVersionInfo = {
     ABI_VIDEODRV_VERSION,
     ABI_XINPUT_VERSION,
     ABI_EXTENSION_VERSION,
-    ABI_FONT_VERSION
 };
 
 static int ModuleDuplicated[] = { };
@@ -646,8 +645,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
             ver = LoaderVersionInfo.xinputVersion;
         else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
             ver = LoaderVersionInfo.extensionVersion;
-        else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
-            ver = LoaderVersionInfo.fontVersion;
 
         abimaj = GET_ABI_MAJOR(data->abiversion);
         abimin = GET_ABI_MINOR(data->abiversion);
-- 
1.7.7.6