From f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 6 Feb 2017 15:19:47 +0100
Subject: Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file
 entirely. Content of that file is now hard-coded.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning:

 ```
 oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings]
 };
 ^
 ```

 This will be address later in coordination with X.org.

 Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems
 unneeded. We drop that one line from oscolor.c.

 Fixes ArcticaProject/nx-libs#259.
---
 nx-X11/programs/Xserver/dix/Imakefile | 8 +-------
 nx-X11/programs/Xserver/dix/globals.c | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix')

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index 7acd1b45c..1024de965 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -91,7 +91,6 @@ OBJS =                          \
  * .macros files or site.def in the directory util/imake.includes/:
  *
  *     DefaultFontPath                COMPILEDDEFAULTFONTPATH
- *     DefaultRGBDatabase             RGB_DB
  *
  * The sample util/imake.includes/Imake.tmpl will provide generic defaults.
  * The values in site.h are simply a last line of defense and should not be
@@ -103,11 +102,6 @@ DEFAULTFONTPATH = DefaultFontPath
 SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
 #endif
 
-#ifdef DefaultRGBDatabase
-DEFAULTRGBDATABASE = DefaultRGBDatabase
-   SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
-#endif
-
 #ifdef DefaultDisplayClass
 DEFAULTDISPLAYCLASS = DefaultDisplayClass
    SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\"
@@ -129,7 +123,7 @@ VENDORRELEASE = XVendorRelease
 #endif
 #endif
 
-SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS)
+SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_DISPLAY_CLASS)
 
 VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES)
 
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c
index 5a2819e50..a0af50fa8 100644
--- a/nx-X11/programs/Xserver/dix/globals.c
+++ b/nx-X11/programs/Xserver/dix/globals.c
@@ -130,7 +130,6 @@ int  logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER;
 char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
 char *defaultTextFont = COMPILEDDEFAULTFONT;
 char *defaultCursorFont = COMPILEDCURSORFONT;
-char *rgbPath = RGB_DB;
 char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
 FontPtr defaultFont;   /* not declared in dix.h to avoid including font.h in
 			every compilation of dix code */
-- 
cgit v1.2.3