From 162a627c4662733241beaf603b78c6deb6e95633 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 30 Oct 2016 02:32:35 +0200
Subject: saver.c: fix unused variable warnings

---
 nx-X11/programs/Xserver/Xext/saver.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index da94847a5..51f18e4e4 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -686,7 +686,6 @@ ProcScreenSaverQueryVersion (client)
     register ClientPtr	client;
 {
     xScreenSaverQueryVersionReply	rep;
-    register int		n;
 
     REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq);
     rep.type = X_Reply;
@@ -708,7 +707,6 @@ ProcScreenSaverQueryInfo (client)
 {
     REQUEST(xScreenSaverQueryInfoReq);
     xScreenSaverQueryInfoReply	rep;
-    register int		n;
     ScreenSaverStuffPtr		pSaver;
     DrawablePtr			pDraw;
     CARD32			lastInput;
@@ -1320,7 +1318,6 @@ SProcScreenSaverQueryVersion (client)
     ClientPtr	client;
 {
     REQUEST(xScreenSaverQueryVersionReq);
-    int	    n;
 
     swaps (&stuff->length);
     REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq);
@@ -1332,7 +1329,6 @@ SProcScreenSaverQueryInfo (client)
     ClientPtr	client;
 {
     REQUEST(xScreenSaverQueryInfoReq);
-    int	    n;
 
     swaps (&stuff->length);
     REQUEST_SIZE_MATCH(xScreenSaverQueryInfoReq);
@@ -1345,7 +1341,6 @@ SProcScreenSaverSelectInput (client)
     ClientPtr	client;
 {
     REQUEST(xScreenSaverSelectInputReq);
-    int	    n;
 
     swaps (&stuff->length);
     REQUEST_SIZE_MATCH(xScreenSaverSelectInputReq);
@@ -1359,7 +1354,6 @@ SProcScreenSaverSetAttributes (client)
     ClientPtr	client;
 {
     REQUEST(xScreenSaverSetAttributesReq);
-    int	    n;
 
     swaps (&stuff->length);
     REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
@@ -1380,7 +1374,6 @@ SProcScreenSaverUnsetAttributes (client)
     ClientPtr	client;
 {
     REQUEST(xScreenSaverUnsetAttributesReq);
-    int	    n;
 
     swaps (&stuff->length);
     REQUEST_SIZE_MATCH(xScreenSaverUnsetAttributesReq);
-- 
cgit v1.2.3


From 903cc06578c88d4994088def8bb821a0f48d2ea0 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 30 Oct 2016 13:45:33 +0100
Subject: Imakefile: remove references to non-existing subdirs

---
 nx-X11/Imakefile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index f2a8ca8ad..9c8eb5a04 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -27,17 +27,7 @@ RELEASE = XOrgReleaseString
 #define OSName Unknown Operating System!
 #endif
 
-#if !BuildServersOnly
-#ifndef Win32Architecture
-#if BuildDocs
-        DOCSDIR = doc
-#endif
-        NLSSUBDIR = nls
-#endif
-#endif
-
-        SUBDIRS = include config lib $(NLSSUBDIR) \
-                  programs $(FONTSDIR) $(DOCSDIR)
+        SUBDIRS = include config lib programs
   LNINSTALLDIRS = lib
 
 #if HasParallelMake
-- 
cgit v1.2.3


From 16947012def69e4abfbe91c57bc9e42ffee02937 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 30 Oct 2016 13:46:11 +0100
Subject: nxagent.keyboard: add quotes

---
 etc/nxagent.keyboard | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/nxagent.keyboard b/etc/nxagent.keyboard
index afe283260..dd6d17eed 100644
--- a/etc/nxagent.keyboard
+++ b/etc/nxagent.keyboard
@@ -1 +1 @@
-rules=xfree86
+rules="xfree86"
-- 
cgit v1.2.3