From 2d776b14fddc5ec70c97aa82672f3a7c9caef6a3 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 May 2015 10:24:24 +0200
Subject: library clean-up: Don't build libNX_Xinerama anymore. Use system's
 libXinerama shared library. (Fixes ArcticaProject/nx-libs#49).

 This commit goes along with a patch from Ulrich Sibiller who managed to
 move the Xinerama awareness for NX sessions into the Xserver code. This
 makes Xinerama support for NX in libNX_Xinerama.so obsolete.

 Fixes ArcticaProject/nx-libs#49
---
 Makefile | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2b5b4946a..14f6e4266 100644
--- a/Makefile
+++ b/Makefile
@@ -154,14 +154,6 @@ install-full:
 	                        "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"/ || true; \
 	    done; \
 
-	# Provide means for Xinerama support in NX/X2Go sessions. This
-	# This also requires three post-install symlinks created by libnx-xinerama1:
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1
-	# Only create the owned directory here for nx-x11-common.
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
-
 	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX)
 	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
 	$(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/
-- 
cgit v1.2.3


From 522cf0089e4db707346c25d826c33e92ef09db8a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 7 Oct 2015 21:33:55 +0200
Subject: X2Go Agent: Add x2goagent.features file that informs X2Go clients
 about the new RandR based Xinerama feature.

---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 14f6e4266..c9a52ac02 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ USRLIBDIR   ?= $(LIBDIR)
 INCLUDEDIR  ?= $(PREFIX)/include
 NXLIBDIR    ?= $(PREFIX)/lib/nx
 X2GOLIBDIR  ?= $(PREFIX)/lib/x2go
+X2GODATADIR  ?= $(PREFIX)/share/x2go
 CONFIGURE   ?= ./configure
 
 NX_VERSION_MAJOR=$(shell ./version.sh 1)
@@ -163,6 +164,10 @@ install-full:
 	$(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/
 	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/
 
+	# x2goagent.features file for X2Go
+	$(INSTALL_DIR) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+	$(INSTALL_FILE) x2goagent.features $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
 	$(INSTALL_SYMLINK) $(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
 
@@ -191,6 +196,10 @@ uninstall-full:
 	$(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent
 	$(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
 
+	# x2goagent.features file for X2Go
+	$(RM_FILE) $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/x2goagent.features
+	$(RM_DIR)  $(DESTDIR)$(X2GODATADIR)/x2gofeature.d/
+
 	if test -d nx-X11; then \
 	    if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
 	    if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
-- 
cgit v1.2.3