Remove all traces of external RGB database (and Speedo)

Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.

4 files changed, 0 insertions, 52 deletions

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index f966d4026..d2159813c 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -600,24 +600,6 @@ winFixupPaths (void)
         winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);
 
 #ifdef RELOCATE_PROJECTROOT
-    if (1) {
-      const char *libx11dir = "/usr/X11R6/lib/X11";
-      size_t libx11dir_len = strlen(libx11dir);
-
-      if (strncmp(libx11dir, rgbPath, libx11dir_len) == 0)
-      {
-          size_t newsize = strlen(rgbPath) - libx11dir_len + basedirlen;
-          char *compose = malloc(newsize + 1);  
-          strcpy(compose, basedir);
-          strcat(compose, rgbPath + libx11dir_len);
-          compose[newsize] = 0;
-          rgbPath = xstrdup (compose);
-          free (compose);
-
-          winMsg (X_DEFAULT, "RgbPath set to \"%s\"\n", rgbPath);
-      }
-    }
-
     if (getenv("XKEYSYMDB") == NULL)
     {
         char buffer[MAX_PATH];
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 2c1877172..a68ead266 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -65,7 +65,6 @@ WinCmdlineRec g_cmdline = {
   NULL,				/* configFile */
 #endif
   NULL,				/* fontPath */
-  NULL,				/* rgbPath */
 #ifdef XWIN_XF86CONFIG
   NULL,				/* keyboard */
 #endif
@@ -673,20 +672,6 @@ winConfigFiles ()
     }
   winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath);
 
-  /* RGBPath */
-  from = X_DEFAULT;
-  if (g_cmdline.rgbPath)
-    {
-      from = X_CMDLINE;
-      rgbPath = g_cmdline.rgbPath;
-    }
-  else if (filesptr != NULL && filesptr->file_rgbpath)
-    {
-      from = X_CONFIG;
-      rgbPath = xstrdup (filesptr->file_rgbpath);
-    }
-  winMsg (from, "RgbPath set to \"%s\"\n", rgbPath);
-
   return TRUE;
 }
 #else
@@ -702,14 +687,6 @@ winConfigFiles ()
       winMsg (X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
     }
 
-  /* RGBPath */
-  if (g_cmdline.rgbPath)
-    {
-      from = X_CMDLINE;
-      rgbPath = g_cmdline.rgbPath;
-      winMsg (X_CMDLINE, "RgbPath set to \"%s\"\n", rgbPath);
-    }
-
   return TRUE;
 }
 #endif
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 8fd9841d7..4b56d639c 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -190,7 +190,6 @@ typedef struct
   char *configFile;
 #endif
   char *fontPath;
-  char *rgbPath;
   /* input devices - keyboard */
 #ifdef XWIN_XF86CONFIG
   char *keyboard;
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index bd0b99977..7139cbaab 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -1278,16 +1278,6 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 
   /*
-   * Look for the '-co' argument
-   */
-  if (IS_OPTION ("-co"))
-    {
-      CHECK_ARGS (1);
-      g_cmdline.rgbPath = argv[++i];
-      return 0; /* Let DIX parse this again */
-    }
-
-  /*
    * Look for the '-query' argument
    */
   if (IS_OPTION ("-query"))