This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from d8b5ca2 debian/changelog: merge with 3.6.x development branch. new 8b45079 nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. Adds: new d055e52 nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. new 91f1fed nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 18 +++++- ...0_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch | 27 +++++++++ ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch | 27 +++++++++ ...compshad_use-MAKEDEPEND-in-path.full+lite.patch | 26 +++++++++ ..._nxproxy_use-MAKEDEPEND-in-path.full+lite.patch | 26 +++++++++ ...omp_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++ ...had_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 58 ++++++++++++++++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 54 ++++++++++++++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 58 ++++++++++++++++++++ debian/patches/series | 9 +++ 11 files changed, 339 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch create mode 100644 debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch create mode 100644 debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch create mode 100644 debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch create mode 100644 debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 8b45079eb73f323d5298555654440f4da2e77ca6 Author: Clemens Lang <cal@macports.org> Date: Sun Mar 15 07:18:14 2015 +0100 nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. Adds: - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch --- debian/changelog | 8 ++++-- ...0_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch | 27 ++++++++++++++++++++ ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch | 27 ++++++++++++++++++++ ...compshad_use-MAKEDEPEND-in-path.full+lite.patch | 26 +++++++++++++++++++ ..._nxproxy_use-MAKEDEPEND-in-path.full+lite.patch | 26 +++++++++++++++++++ debian/patches/series | 4 +++ 6 files changed, 116 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 836abc9..b6bb7c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low - [ X2Go Release Manager ] - * Continue development + [ Clemens Lang ] + * Use path discovery for finding makedepend. Remove old cruft. Adds: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch -- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100 diff --git a/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..edebac8 --- /dev/null +++ b/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,27 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + +--- a/nxcomp/configure.in ++++ b/nxcomp/configure.in +@@ -362,20 +362,7 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) +- +-if test -x "../nx-X11/config/makedepend/makedepend" ; then +- MAKEDEPEND=../nx-X11/config/makedepend/makedepend +-else +- if test -x "/usr/X11R6/bin/makedepend" ; then +- MAKEDEPEND=/usr/X11R6/bin/makedepend +- else +- if test -x "/usr/openwin/bin/makedepend" ; then +- MAKEDEPEND=/usr/openwin/bin/makedepend +- else +- MAKEDEPEND=/usr/bin/makedepend +- fi +- fi +-fi ++MAKEDEPEND="$(which makedepend)" + + dnl Determine what to build based on the platform. + dnl Override the LIBS settings on Cygwin32 so that diff --git a/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..0d5f220 --- /dev/null +++ b/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,27 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + +--- a/nxcompext/configure.in ++++ b/nxcompext/configure.in +@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION} + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) +- +-if test -x "../nx-X11/config/makedepend/makedepend" ; then +- MAKEDEPEND=../nx-X11/config/makedepend/makedepend +-else +- if test -x "/usr/X11R6/bin/makedepend" ; then +- MAKEDEPEND=/usr/X11R6/bin/makedepend +- else +- if test -x "/usr/openwin/bin/makedepend" ; then +- MAKEDEPEND=/usr/openwin/bin/makedepend +- else +- MAKEDEPEND=/usr/bin/makedepend +- fi +- fi +-fi ++MAKEDEPEND="$(which makedepend)" + + dnl Determine what to build based on the platform. + dnl Override the LIBS settings on Cygwin32 so that diff --git a/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..15e94bc --- /dev/null +++ b/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,26 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -269,19 +269,6 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) +- +-if test -x "../nx-X11/config/makedepend/makedepend" ; then +- MAKEDEPEND=../nx-X11/config/makedepend/makedepend +-else +- if test -x "/usr/X11R6/bin/makedepend" ; then +- MAKEDEPEND=/usr/X11R6/bin/makedepend +- else +- if test -x "/usr/openwin/bin/makedepend" ; then +- MAKEDEPEND=/usr/openwin/bin/makedepend +- else +- MAKEDEPEND=makedepend +- fi +- fi +-fi ++MAKEDEPEND="$(which makedepend)" + + AC_OUTPUT(Makefile) diff --git a/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..0b18912 --- /dev/null +++ b/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,26 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + +--- a/nxproxy/configure.in ++++ b/nxproxy/configure.in +@@ -167,19 +167,6 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) +- +-if test -x "../nx-X11/config/makedepend/makedepend" ; then +- MAKEDEPEND=../nx-X11/config/makedepend/makedepend +-else +- if test -x "/usr/X11R6/bin/makedepend" ; then +- MAKEDEPEND=/usr/X11R6/bin/makedepend +- else +- if test -x "/usr/openwin/bin/makedepend" ; then +- MAKEDEPEND=/usr/openwin/bin/makedepend +- else +- MAKEDEPEND=makedepend +- fi +- fi +-fi ++MAKEDEPEND="$(which makedepend)" + + AC_OUTPUT(Makefile) diff --git a/debian/patches/series b/debian/patches/series index 522b398..af11736 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,6 +32,10 @@ 0055_nx-X11_imake-Werror-format-security.full.patch 0056_nx-X11_Werror-format-security.full.patch 0057_nx-X11_sanitize-eventmasks.full.patch +0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch +0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch +0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch +0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch 0101_nxagent_set-rgb-path.full.patch 0102_xserver-xext_set-securitypolicy-path.full.patch 0103_nxagent_set-X0-config-path.full.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d055e523d3bcbd5e0582a4ac537a168e1044c52c Author: Clemens Lang <cal@macports.org> Date: Sun Mar 15 07:21:00 2015 +0100 nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. Adds: - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch --- debian/changelog | 4 ++++ ...omp_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++++++++++++++ ...had_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 44 insertions(+) diff --git a/debian/changelog b/debian/changelog index b6bb7c1..2f24bf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + Adds: + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-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/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch new file mode 100644 index 0000000..04369f0 --- /dev/null +++ b/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch @@ -0,0 +1,19 @@ +Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. +Author: Clemens Lang <cal@macports.org> + +--- a/nxcomp/configure.in ++++ b/nxcomp/configure.in +@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then + fi + + dnl Under Darwin we don't have support for -soname option and +-dnl we need the -bundle flag. Under Solaris, instead, we need ++dnl we need the -dynamiclib flag. Under Solaris, instead, we need + dnl the options -G -h. + + if test "$DARWIN" = yes; then +- LDFLAGS="$LDFLAGS -bundle" ++ LDFLAGS="$LDFLAGS -dynamiclib" + elif test "$SUN" = yes; then + LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" + else diff --git a/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch new file mode 100644 index 0000000..a754245 --- /dev/null +++ b/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch @@ -0,0 +1,19 @@ +Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. +Author: Clemens Lang <cal@macports.org> + +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then + fi + + dnl Under Darwin we don't have support for -soname option and +-dnl we need the -bundle flag. Under Solaris, instead, we need ++dnl we need the -dynamiclib flag. Under Solaris, instead, we need + dnl the options -G -h. + + if test "$DARWIN" = yes; then +- LDFLAGS="$LDFLAGS -bundle" ++ LDFLAGS="$LDFLAGS -dynamiclib" + elif test "$SUN" = yes; then + LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" + else diff --git a/debian/patches/series b/debian/patches/series index af11736..9e29738 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,6 +36,8 @@ 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch +0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch +0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch 0101_nxagent_set-rgb-path.full.patch 0102_xserver-xext_set-securitypolicy-path.full.patch 0103_nxagent_set-X0-config-path.full.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 91f1fed27236f0fa880971fc4cad13e95c794afc Author: Clemens Lang <cal@macports.org> Date: Sun Mar 15 07:33:51 2015 +0100 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 --- debian/changelog | 6 ++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 58 ++++++++++++++++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 54 ++++++++++++++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 58 ++++++++++++++++++++ debian/patches/series | 3 + 5 files changed, 179 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2f24bf2..98f67b6 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 0000000..6a9dab8 --- /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 0000000..0db573f --- /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 0000000..3099698 --- /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 9e29738..f327ed1 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 -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org