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/Imakefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index fe70d007a..a18f04108 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -160,10 +160,7 @@ INSTPGMFLAGS =
 #if HasPam && HasPamMisc
         PAMLIBS = PamLibraries PamMiscLibraries
 #endif
-#if !(SystemV4 || UseRgbTxt)
-       DBMLIBS = DBMLibrary
-#endif
-        SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \
+        SYSLIBS = $(ZLIB) MathLibrary $(USB) \
 		  $(PAMLIBS)  $(EXTRASYSLIBS)
 #if !HasCbrt
            CBRT = mi/LibraryTargetName(cbrt)
-- 
cgit v1.2.3