nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems.

Adds:
  - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
  - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
  - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch

5 files changed, 179 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 2f24bf25a..98f67b664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
     Adds:
     - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
     - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
+  * Use the correct library naming scheme on OS X. It differs from other
+    UNIX-based systems.
+    Adds:
+    - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+    - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+    - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
 
  -- X2Go Release Manager <git-admin@x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
new file mode 100644
index 000000000..6a9dab8d3
--- /dev/null
+++ b/debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
@@ -0,0 +1,58 @@
+Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
+Author: Clemens Lang <cal@macports.org>
+
+--- a/nxcomp/Makefile.in
++++ b/nxcomp/Makefile.in
+@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/u
+ LIBRARY = Xcomp
+ 
+ LIBNAME    = lib$(LIBRARY)
++ifeq ($(shell uname),Darwin)
++LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
++LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
++LIBSHARED  = lib$(LIBRARY).dylib
++LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
++else
+ LIBFULL    = lib$(LIBRARY).so.$(VERSION)
+ LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
+ LIBSHARED  = lib$(LIBRARY).so
++LIBFLAGS   =
++endif
+ LIBARCHIVE = lib$(LIBRARY).a
+ 
+ LIBCYGSHARED  = cyg$(LIBRARY).dll
+@@ -232,7 +240,7 @@ COBJ   = $(CSRC:.c=.o)
+ CXXOBJ = $(CXXSRC:.cpp=.o)
+ 
+ $(LIBFULL):	 $(CXXOBJ) $(COBJ)
+-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
++		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+ 
+ $(LIBLOAD):	 $(LIBFULL)
+ 		 rm -f $(LIBLOAD)
+@@ -278,9 +286,9 @@ install.lib: all
+ 	./mkinstalldirs $(DESTDIR)${libdir}
+ 	./mkinstalldirs $(DESTDIR)${includedir}/nx
+ 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}
+-	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
++	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
+ 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
+ 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
+ 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+@@ -293,9 +301,9 @@ uninstall.bin:
+ 
+ uninstall.lib:
+ 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
+ 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+ 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+ 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
diff --git a/debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
new file mode 100644
index 000000000..0db573f21
--- /dev/null
+++ b/debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
@@ -0,0 +1,54 @@
+Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
+Author: Clemens Lang <cal@macports.org>
+
+--- a/nxcompext/Makefile.in
++++ b/nxcompext/Makefile.in
+@@ -82,9 +82,17 @@ DEPENDINCLUDES =  -I/usr/include/c++ -I/
+ LIBRARY = Xcompext
+ 
+ LIBNAME    = lib$(LIBRARY)
++ifeq ($(shell uname),Darwin)
++LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
++LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
++LIBSHARED  = lib$(LIBRARY).dylib
++LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
++else
+ LIBFULL    = lib$(LIBRARY).so.$(VERSION)
+ LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
+ LIBSHARED  = lib$(LIBRARY).so
++LIBFLAGS   =
++endif
+ LIBARCHIVE = lib$(LIBRARY).a
+ 
+ LIBCYGSHARED  = cyg$(LIBRARY).dll
+@@ -113,7 +121,7 @@ COBJ   = $(CSRC:.c=.o)
+ CXXOBJ = $(CXXSRC:.cpp=.o)
+ 
+ $(LIBFULL):	 $(CXXOBJ) $(COBJ)
+-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
++		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+ 
+ $(LIBLOAD):	 $(LIBFULL)
+ 		 rm -f $(LIBLOAD)
+@@ -159,8 +167,8 @@ install.lib: all
+ 	./mkinstalldirs $(DESTDIR)${libdir}
+ 	./mkinstalldirs $(DESTDIR)${includedir}/nx
+ 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcompext.so.3	$(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
+ 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
+ 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+ 
+@@ -172,8 +180,8 @@ uninstall.bin:
+ 
+ uninstall.lib:
+ 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
+ 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+ 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+ 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
diff --git a/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
new file mode 100644
index 000000000..3099698c9
--- /dev/null
+++ b/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
@@ -0,0 +1,58 @@
+Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems.
+Author: Clemens Lang <cal@macports.org>
+
+--- a/nxcompshad/Makefile.in
++++ b/nxcompshad/Makefile.in
+@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/u
+ LIBRARY = Xcompshad
+ 
+ LIBNAME    = lib$(LIBRARY)
++ifeq ($(shell uname),Darwin)
++LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
++LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
++LIBSHARED  = lib$(LIBRARY).dylib
++LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
++else
+ LIBFULL    = lib$(LIBRARY).so.$(VERSION)
+ LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
+ LIBSHARED  = lib$(LIBRARY).so
++LIBFLAGS   =
++endif
+ LIBARCHIVE = lib$(LIBRARY).a
+ 
+ MSRC   = Main.c
+@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBS
+ endif
+ 
+ $(LIBFULL):	$(CXXOBJ) $(COBJ)
+-		$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
++		$(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
+ 
+ $(LIBLOAD):	$(LIBFULL)
+ 		rm -f $(LIBLOAD)
+@@ -193,9 +201,9 @@ install.lib: all
+ 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
+ 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
+ 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
+-	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
+-	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
++	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
++	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
+ 	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
+ 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+ 
+@@ -207,9 +215,9 @@ uninstall.bin:
+ 
+ uninstall.lib:
+ 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
+-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
++	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
+ 	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
+ 	$(RM_DIR) $(DESTDIR)${libdir}/nx/
+ 	$(RM_DIR) $(DESTDIR)${includedir}/nx/
diff --git a/debian/patches/series b/debian/patches/series
index 9e2973870..f327ed10a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,6 +67,7 @@
 0321_nxagent_x2go-specific-keystroke-config.full.patch
 0400_nxcomp-version.full+lite.patch
 #0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
+0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
 0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
 0602_nx-X11_initgroups.full.patch
@@ -74,6 +75,8 @@
 0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
 0606_nx-X11_build-on-aarch64.full.patch
 0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
+0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
 0990_fix-DEBUG-and-TEST-builds.full.patch
 0991_fix-hr-typos.full+lite.patch
 0991_fix-hr-typos.full.patch