From 71589a05045ef70d5f057e3ad29a62ca0b4c989d Mon Sep 17 00:00:00 2001 From: X2Go Release Manager Date: Tue, 17 Mar 2015 19:09:05 +0100 Subject: Mid-release fixup: Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full*. --- debian/changelog | 2 + ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch | 47 ------------------ ...610_nxcompext_use-MAKEDEPEND-in-path.full.patch | 47 ++++++++++++++++++ ...compshad_use-MAKEDEPEND-in-path.full+lite.patch | 47 ------------------ ...11_nxcompshad_use-MAKEDEPEND-in-path.full.patch | 47 ++++++++++++++++++ ...had_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 ------- ...compshad_use-dynamiclib-flag-on-OS-X.full.patch | 19 +++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 54 -------------------- ...orrect-library-naming-scheme-on-OS-X.full.patch | 54 ++++++++++++++++++++ ...t-library-naming-scheme-on-OS-X.full+lite.patch | 58 ---------------------- ...orrect-library-naming-scheme-on-OS-X.full.patch | 58 ++++++++++++++++++++++ debian/patches/series | 10 ++-- 12 files changed, 232 insertions(+), 230 deletions(-) delete mode 100644 debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch delete mode 100644 debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch delete mode 100644 debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch create mode 100644 debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch delete mode 100644 debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch create mode 100644 debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch delete mode 100644 debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch create mode 100644 debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch diff --git a/debian/changelog b/debian/changelog index 9779b57e1..9591915dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*. - Add overlooked Obsolete: statement to libNX_Xfixes3. + * Mid-release fixup: + - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. -- X2Go Release Manager Tue, 17 Mar 2015 18:48:06 +0100 diff --git a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch deleted file mode 100644 index da7924f81..000000000 --- a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) -Author: Clemens Lang - v2: Mihai Moldovan - ---- a/nxcompext/configure.in -+++ b/nxcompext/configure.in -@@ -219,18 +219,15 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION} - dnl Find makedepend somewhere. - - AC_SUBST(MAKEDEPEND) -+MAKEDEPEND="$(which 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 -+# Try to desperately find makedepend. -+# Set MAKEDEPEND to the shipped makedepend binary. This will not -+# exist in nx-libs-lite, though, in which case MAKEDEPEND -+# will stay empty. -+if test -z "${MAKEDEPEND}"; then -+ if test -x "../nx-X11/config/makedepend/makedepend"; then -+ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" - fi - fi - ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -144,9 +144,9 @@ depends: depend.status - depend: depend.status - - depend.status: -- if [ -x $(MAKEDEPEND) ] ; then \ -+ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ - $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ -- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ -+ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ - $(CXXSRC) 2>/dev/null; \ - fi - touch depend.status diff --git a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch new file mode 100644 index 000000000..da7924f81 --- /dev/null +++ b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang + v2: Mihai Moldovan + +--- a/nxcompext/configure.in ++++ b/nxcompext/configure.in +@@ -219,18 +219,15 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION} + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -144,9 +144,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ + $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status diff --git a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch deleted file mode 100644 index 329a48937..000000000 --- a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) -Author: Clemens Lang - v2: Mihai Moldovan - ---- a/nxcompshad/configure.in -+++ b/nxcompshad/configure.in -@@ -269,18 +269,15 @@ fi - dnl Find makedepend somewhere. - - AC_SUBST(MAKEDEPEND) -+MAKEDEPEND="$(which 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 -+# Try to desperately find makedepend. -+# Set MAKEDEPEND to the shipped makedepend binary. This will not -+# exist in nx-libs-lite, though, in which case MAKEDEPEND -+# will stay empty. -+if test -z "${MAKEDEPEND}"; then -+ if test -x "../nx-X11/config/makedepend/makedepend"; then -+ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" - fi - fi - ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -179,9 +179,9 @@ depends: depend.status - depend: depend.status - - depend.status: -- if [ -x $(MAKEDEPEND) ] ; then \ -+ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ - $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ -- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ -+ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ - fi - touch depend.status - diff --git a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch new file mode 100644 index 000000000..329a48937 --- /dev/null +++ b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang + v2: Mihai Moldovan + +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -269,18 +269,15 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -179,9 +179,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status + diff --git a/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch deleted file mode 100644 index a75424511..000000000 --- a/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. -Author: Clemens Lang - ---- 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/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch new file mode 100644 index 000000000..a75424511 --- /dev/null +++ b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch @@ -0,0 +1,19 @@ +Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. +Author: Clemens Lang + +--- 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/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch deleted file mode 100644 index 0db573f21..000000000 --- a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +++ /dev/null @@ -1,54 +0,0 @@ -Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. -Author: Clemens Lang - ---- 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/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 + +--- 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/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch deleted file mode 100644 index 3099698c9..000000000 --- a/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +++ /dev/null @@ -1,58 +0,0 @@ -Description: Use the correct library naming scheme on OS X. It differs from other UNIX-based systems. -Author: Clemens Lang - ---- 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/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch new file mode 100644 index 000000000..3099698c9 --- /dev/null +++ b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.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 + +--- 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 69fca5bd4..4ad233cc4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -70,13 +70,13 @@ 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-MAKEDEPEND-in-path.full+lite.patch -0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch +0610_nxcompext_use-MAKEDEPEND-in-path.full.patch +0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch -0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch -0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch -0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch +0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch +0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch 0990_fix-DEBUG-and-TEST-builds.full.patch 0991_fix-hr-typos.full+lite.patch 0991_fix-hr-typos.full.patch -- cgit v1.2.3