From 71589a05045ef70d5f057e3ad29a62ca0b4c989d Mon Sep 17 00:00:00 2001
From: X2Go Release Manager <git-admin@x2go.org>
Date: Tue, 17 Mar 2015 19:09:05 +0100
Subject: Mid-release fixup: Rename *nxcomp{ext,shad}*.full+lite* to
 *nxcomp{ext,shad}*.full*.

---
 ...orrect-library-naming-scheme-on-OS-X.full.patch | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch

(limited to 'debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch')

diff --git a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
new file mode 100644
index 000000000..0db573f21
--- /dev/null
+++ b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.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
-- 
cgit v1.2.3