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/hw/nxagent/Agent.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent')

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


From 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 1 Jul 2016 13:54:11 +0200
Subject: finally drop libNX_Xext

---
 nx-X11/programs/Xserver/hw/nxagent/Render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 72da2df19..866ab581c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -44,7 +44,7 @@
 #undef  Pixmap
 
 #include "region.h"
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 
 #include "Display.h"
 #include "Pixmaps.h"
-- 
cgit v1.2.3