From e77e37ff0f97a5845fa0c634e978361541d7991f Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 1 Jul 2016 00:05:30 +0200
Subject: remove XShape code from libNX_Xext

use system libXext instead
---
 nx-X11/programs/Xserver/Imakefile             | 8 ++++----
 nx-X11/programs/Xserver/Xext/extmod/modinit.h | 3 +--
 nx-X11/programs/Xserver/Xext/shape.c          | 3 +--
 nx-X11/programs/Xserver/hw/nxagent/Agent.h    | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'nx-X11/programs')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 93a3286b1..d0699d857 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -429,7 +429,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
                 -lXcomp \
                 -lXcompext -lXcompshad \
                 -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
-                -lNX_X11 -lNX_Xext
+                -lNX_X11 -lNX_Xext -Xext
 #elif defined(cygwinArchitecture)
 NXAGENTNXLIBS = -L ../../../nxcomp  \
                 -L../../../nx-X11/exports/lib \
@@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp  \
                 -lXcomp \
                 -lXcompext -lXcompshad \
                 -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \
-                -lNX_X11 -lNX_Xext
+                -lNX_X11 -lNX_Xext -lXext
 #else
 NXAGENTNXLIBS = -L ../../../nxcomp  \
                 -L../../../nx-X11/exports/lib \
@@ -445,7 +445,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp  \
                 -lXcomp \
                 -lXcompext -lXcompshad \
                 -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
-                -lNX_X11 -lNX_Xext
+                -lNX_X11 -lNX_Xext -lXext
 #endif
 #endif
 
@@ -478,7 +478,7 @@ nxagent_static_nolibs:  nxagent
 	else exit 0; fi
 	$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
 	$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \
-	$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS)
+	$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS)
 #endif /* NXAgentServer */
 
 #if defined(NXWinServer) && NXWinServer
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 96a349add..24cef286b 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -11,8 +11,7 @@
 
 #ifdef SHAPE
 extern void ShapeExtensionInit(INITARGS);
-#define _SHAPE_SERVER_  /* don't want Xlib structures */
-#include <nx-X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
 #endif
 
 #ifdef XTEST
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 8516192c0..51fcd7d9f 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -44,8 +44,7 @@ in this Software without prior written authorization from The Open Group.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#define _SHAPE_SERVER_	/* don't want Xlib structures */
-#include <nx-X11/extensions/shapestr.h>
+#include <X11/extensions/shapeproto.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index ec312bad2..2fa2b6240 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -104,7 +104,7 @@ typedef XID KeySym64;
 #define NX_TRANS_SOCKET
 #define GC XlibGC
 #include <nx-X11/Xlib.h>
-#include <nx-X11/extensions/shape.h>
+#include <X11/extensions/shape.h>
 #undef GC
 
 #ifdef _XSERVER64_tmp
-- 
cgit v1.2.3