mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-18 19:52:21 +00:00
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.
This commit is contained in:
parent
5e363500c8
commit
dda10c9066
25 changed files with 12 additions and 341 deletions
|
|
@ -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];
|
||||
|
|
|
|||
Loading…
Reference in a new issue