From f6a11402755a2489babb8bbf1c3b8b97b8d1ac7a Mon Sep 17 00:00:00 2001 From: Mike Gabriel 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 which seems unneeded. We drop that one line from oscolor.c. Fixes ArcticaProject/nx-libs#259. --- nx-X11/config/cf/X11.tmpl | 6 ------ 1 file changed, 6 deletions(-) (limited to 'nx-X11/config/cf/X11.tmpl') diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index fe94e1f4d..54f94355d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -312,12 +312,6 @@ XORGRELSTRING = XorgManVersionString #ifndef DefaultFSFontPath # define DefaultFSFontPath DefaultFontPath #endif -#ifndef DefaultRGBDatabase -#define DefaultRGBDatabase $(USRDATADIR)/rgb -#endif -#ifndef UseRgbTxt -#define UseRgbTxt NO /* default is to compile with dbm */ -#endif #ifndef UseMemLeak #define UseMemLeak NO #endif -- cgit v1.2.3