Merge branch 'uli42-pr/various10' into 3.6.x

Attribute GH PR #1075: #1075

.github/workflows/nx-libs.yml

@@ -27,8 +27,6 @@ jobs:
           - { container: 'debian:sid', cc-version: clang }
           - { container: 'quay.io/centos/centos:7', cc-version: gcc }
           - { container: 'quay.io/centos/centos:7', cc-version: clang }
-          - { container: 'quay.io/centos/centos:stream8', cc-version: gcc }
-          - { container: 'quay.io/centos/centos:stream8', cc-version: clang }
           - { container: 'quay.io/centos/centos:stream9', cc-version: gcc }
           - { container: 'quay.io/centos/centos:stream9', cc-version: clang }
           - { container: 'fedora:latest', cc-version: gcc }
@@ -100,7 +98,7 @@ jobs:
             apt-get install -q -y \
               libpixman-1-dev libjpeg-dev libxcomposite-dev libxdamage-dev \
               libxml2-dev libxfont-dev libxinerama-dev libxpm-dev libxrandr-dev \
-              libxtst-dev x11proto-fonts-dev
+              libxtst-dev x11proto-fonts-dev libtirpc-dev
             # soft requirements
             apt-get install -q -y \
               quilt x11-xkb-utils

Makefile

@@ -116,7 +116,7 @@ ifneq "$(strip $(NX_VERSION_CUSTOM))" ""
 endif
 
 imakeconfig:
-	@echo;
+	@echo
 	@echo "===> $@"
 	# auto-config some setting
 

nx-X11/Makefile

@@ -70,7 +70,7 @@ xmakefile:
 	else \
 	    exit 0; \
 	fi
-	which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+	which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
 # don't allow any default rules in this Makefile
 .SUFFIXES:

nx-X11/config/cf/Imake.rules

@@ -547,7 +547,7 @@ clean cleantc::								@@\
 		:; \							@@\
 	else \								@@\
 		if [ -h dir ]; then \					@@\
-			(test -n "${VERBOSE}" && test -n "${VERBOSE}" && set -x; rm -f dir); \				@@\
+			(test -n "${VERBOSE}" && set -x; rm -f dir); \				@@\
 		fi; \							@@\
 		(test -n "${VERBOSE}" && set -x; $(MKDIRHIER) dir); \				@@\
 	fi
@@ -1107,7 +1107,7 @@ CplusplusProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib)
 
 #ifndef RMoveToBakFile
 #define RMoveToBakFile(file) -@if [ -f file ]; then test -n "${VERBOSE}" && set -x; \		@@\
-	RemoveFile(file.bak); @$(MV) file file.bak; \			@@\
+	RemoveFile(file.bak); $(MV) file file.bak; \			@@\
 	else exit 0; fi
 #endif /* RMoveToBakFile */
 
@@ -1976,7 +1976,7 @@ DependDependencyStatement()						@@\
 NoCmpScript(ProgramTargetName($(DEPEND)))				@@\
 									@@\
 ProgramTargetName($(DEPEND)):						@@\
-	echo "using system-wide depend, continuing in $(CURRENT_DIR)"
+	@test -z "${VERBOSE}" || echo "using system-wide depend, continuing in $(CURRENT_DIR)"
 
 #endif /* UseInstalled */
 #endif /* DependDependency */
@@ -2069,7 +2069,7 @@ target:: ProgramTargetName($(IMAKE))					@@\
 NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf)			@@\
 									@@\
 ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
-	echo "using system-wide imake, continuing in $(CURRENT_DIR)"
+	@test -z "${VERBOSE}" || echo "using system-wide imake, continuing in $(CURRENT_DIR)"
 #endif /* UseInstalled */
 #endif /* ImakeDependency */
 

nx-X11/config/cf/X11.tmpl

@@ -1500,7 +1500,7 @@ install:: deps								@@\
 	  $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \	@@\
 		$(DESTDIR)$(DOCHTMLDIR)); \				@@\
 	  for i in name*.png; do \					@@\
-	    if [ -f $$i ]; then (test -n "${VERBOSE}" && test -n "${VERBOSE}" && set -x; \				@@\
+	    if [ -f $$i ]; then (test -n "${VERBOSE}" && set -x; \	@@\
 	      $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i \		@@\
 		$(DESTDIR)$(DOCHTMLDIR)); \				@@\
 	    fi; \							@@\

nx-X11/config/cf/lnxLib.rules

@@ -136,7 +136,8 @@ install:: Concat(lib,libname.so.rev) 					@@\
 install:: Concat(lib,libname.so) 					@@\
 	MakeDir($(DESTDIR)dest)						@@\
 	@set +e; SetRevisions(rev); \					@@\
-		test -n "${VERBOSE}" && set -xe; \						@@\
+		set -e; \                                               @@\
+		test -n "${VERBOSE}" && set -x; \			@@\
 		$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
 		$(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \	@@\
 		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
@@ -207,7 +208,8 @@ Concat(lib,libname.so):  solist $(EXTRALIBRARYDEPS)			@@\
 									@@\
 clean::									@@\
 	@set +e; SetRevisions(rev); \					@@\
-		test -n "${VERBOSE}" && set -xe; \						@@\
+		set -e; \						@@\
+		test -n "${VERBOSE}" && set -xe; \			@@\
 		$(RM) Concat(lib,libname.so.$$MAJ); \			@@\
 		$(RM) Concat(lib,libname.so.$$MAJ.$$MIN)		@@\
 	$(RM) Concat(lib,libname.so)

nx-X11/config/cf/xorg.cf

@@ -198,15 +198,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 #define BuildXKBlib		YES
 #endif
 
-/*
- * When this is set, modules are always built separately from the libraries
- * that statically link into an Xserver.  This is for platforms where the
- * module and native object formats are different (e.g., OS/2).
- */
-#ifndef BuildModuleInSubdir
-#define BuildModuleInSubdir	NO
-#endif
-
 /*
  * Default settings for which X Servers to build.
  */

nx-X11/programs/Xserver/GL/Imakefile

@@ -7,14 +7,8 @@
 
 SUBDIRS = glx $(CORE_SUBDIR)
 
-
-#if BuildModuleInSubdir
-SRCS = glx/module/?*.c $(MSRCS)
-OBJS = glx/module/?*.o $(MOBJS)
-#else
 SRCS = glx/?*.c $(MSRCS)
 OBJS = glx/?*.o $(MOBJS)
-#endif
 
 DONES = glx/DONE
 

nx-X11/programs/Xserver/Imakefile

@@ -58,8 +58,6 @@ INSTPGMFLAGS =
 
 #define FBLibs PreFbLibs FbPostFbLibs
 
-#define MiExtLibs $(SHADOW)
-
 #define AllFBLibs PreFbLibs $(FB) PostFbLibs
 
 #if BuildGlxExt
@@ -76,9 +74,6 @@ INSTPGMFLAGS =
 #if BuildXKB
          XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS))
          XKBDIR = xkb
-#if defined(XorgVersion)
-    XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
-#endif
 #endif
 #if BuildDBE
          DBEEXT = dbe/LibraryTargetName(dbe)
@@ -135,8 +130,6 @@ INSTPGMFLAGS =
         BSDEMUL = $(DEPXBSDLIB)
              FB = fb/LibraryTargetName(fb)
          DAMAGE = miext/damage/LibraryTargetName(damage)
-         SHADOW = miext/shadow/LibraryTargetName(shadow)
-          LAYER = miext/layer/LibraryTargetName(layer)
 #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
              /* Order of libraries is important when linking in mingw or
               * cygwin. libmi.a requires ffs from libdix.a. So it is added
@@ -147,21 +140,11 @@ INSTPGMFLAGS =
 #endif
    MIINITEXTOBJ = mi/miinitext.o
             DIX = dix/LibraryTargetName(dix)
-#if UsbMouseSupport
-#if !HasLibUsb
-            USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb)
-#else
-            USB = UsbHidLib
-#endif
-#endif
 #ifdef ServerExtraSysLibs
    EXTRASYSLIBS = ServerExtraSysLibs
-#endif
-#if HasPam && HasPamMisc
-        PAMLIBS = PamLibraries PamMiscLibraries
 #endif
         SYSLIBS = $(ZLIB) MathLibrary $(USB) \
-		  $(PAMLIBS)  $(EXTRASYSLIBS)
+		  $(EXTRASYSLIBS)
 #if !HasCbrt
            CBRT = mi/LibraryTargetName(cbrt)
 #endif
@@ -195,11 +178,7 @@ XCOMM
 FBSUBDIR = fb
 MIDAMAGEDIR = miext/damage
 FBDIR  = fb
-#ifndef Win32Architecture
 NXAGENTDDXDIR = hw/nxagent
-#else
-NXAGENTDDXDIR = hw
-#endif
 
 NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
 
@@ -407,7 +386,7 @@ nxagent_static_nolibs:  nxagent
 #endif /* NXAgentServer */
 
 
-MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
+MIEXTDIRS = $(MIDAMAGEDIR)
 IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
 DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \
 	  $(HPDDXDIR) $(XFREE86DDXDIR) \

nx-X11/programs/Xserver/Xext/security.c

@@ -73,11 +73,6 @@ in this Software without prior written authorization from The Open Group.
 # define DEFAULTPOLICYFILE NULL
 #endif
 
-#if defined(WIN32) || defined(__CYGWIN__)
-#include <nx-X11/Xos.h>
-#undef index
-#endif
-
 static int SecurityErrorBase;  /* first Security error number */
 static int SecurityEventBase;  /* first Security event number */
 

nx-X11/programs/Xserver/Xext/shape.c

@@ -55,7 +55,6 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #include "protocol-versions.h"
 #include "regionstr.h"
-#include "gcstruct.h"
 
 typedef	RegionPtr (*CreateDftPtr)(
 	WindowPtr /* pWin */

nx-X11/programs/Xserver/Xext/shm.c

@@ -149,7 +149,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
 }
 
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 
 static Bool badSysCall = FALSE;
 

nx-X11/programs/Xserver/Xext/xf86bigfont.c

@@ -51,10 +51,6 @@
 #ifdef SVR4
 #include <sys/sysmacros.h>
 #endif
-#if defined(__CYGWIN__) || defined(__SCO__)
-#include <sys/param.h>
-#include <sys/sysmacros.h>
-#endif
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/stat.h>
@@ -110,7 +106,7 @@ static unsigned int pagesize;
 
 static Bool badSysCall = FALSE;
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 
 static void
 SigSysHandler(
@@ -198,7 +194,7 @@ XFree86BigfontExtensionInit()
 	FontShmdescIndex = AllocateFontPrivateIndex();
 #endif /* HAS_XFONT2 */
 
-#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
+#if !defined(CSRG_BASED)
 	pagesize = SHMLBA;
 #else
 # ifdef _SC_PAGESIZE

nx-X11/programs/Xserver/dix/property.c

@@ -549,14 +549,14 @@ ProcGetProperty(ClientPtr client)
 	return(Success);
     }
 
-/*
- *  Return type, format, value to client
- */
+    /*
+     *  Return type, format, value to client
+     */
     n = (pProp->format/8) * pProp->size; /* size (bytes) of prop */
     ind = stuff->longOffset << 2;        
 
-   /* If longOffset is invalid such that it causes "len" to
-	    be negative, it's a value error. */
+    /* If longOffset is invalid such that it causes "len" to
+    be negative, it's a value error. */
 
     if (n < ind)
     {

nx-X11/programs/Xserver/fb/fbbltone.c

@@ -440,8 +440,8 @@ fbBltOne (FbStip    *src,
 
 #define Mask24(x,r) (Mask24Pos(x,r) < FB_UNIT ? \
 		     (Mask24Pos(x,r) < 0 ? \
-		      0xffffff >> Mask24Neg (x,r) : \
-		      0xffffff << Mask24Check(x,r)) : 0)
+		      0xffffffU >> Mask24Neg (x,r) : \
+		      0xffffffU << Mask24Check(x,r)) : 0)
 
 #define SelMask24(b,n,r)	((((b) >> n) & 1) * Mask24(n,r))
 
@@ -804,12 +804,12 @@ fbBltPlane (FbBits	    *src,
 #ifdef FB_24BIT
     if (srcBpp == 24)
     {
-	int w = 24;
+	int tmpw = 24;
 
 	rot0 = FbFirst24Rot (srcX);
-	if (srcX + w > FB_UNIT)
-	    w = FB_UNIT - srcX;
-	srcMaskFirst = FbRot24(pm,rot0) & FbBitsMask(srcX,w);
+	if (srcX + tmpw > FB_UNIT)
+	    tmpw = FB_UNIT - srcX;
+	srcMaskFirst = FbRot24(pm,rot0) & FbBitsMask(srcX,tmpw);
     }
     else
 #endif