This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 3b4a915984b3136f6fddb0cdfdec01cf64715c46 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 9 11:46:07 2015 +0100 Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch). Make sure nxcompshad get built against nx-X11. . Furthermore /usr/X11R6/lib is an outdated path on current Debian systems. --- ...nxcompshad_build-against-nx-x11-only.full.patch | 39 -------------------- debian/patches/series | 1 - nxcompshad/Makefile.in | 4 +- nxcompshad/configure.in | 2 +- 4 files changed, 3 insertions(+), 43 deletions(-) diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch deleted file mode 100644 index 4e92c3b..0000000 --- a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Build nxcompshad against nx-X11. - Make sure nxcompshad get built against nx-X11. - . - Furthermore /usr/X11R6/lib is an outdated path on - current Debian systems. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -+LIBS = @LIBS@ -lX11 - - # - # Only if THREADS is defined. -@@ -162,7 +162,7 @@ - -Wl,--enable-auto-import \ - -Wl,--whole-archive ${LIBARCHIVE} \ - -Wl,--no-whole-archive \ -- ${LIBS} -L/usr/X11R6/lib -+ ${LIBS} - - $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) - # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) ---- a/nxcompshad/configure.in -+++ b/nxcompshad/configure.in -@@ -19,7 +19,7 @@ - - if test -d "../nx-X11/exports/include" ; then - CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" -- LIBS="$LIBS -L../nx-X11/exports/lib" -+ LIBS="-L../nx-X11/exports/lib" - fi - - dnl Check whether --with-ipaq was given. diff --git a/debian/patches/series b/debian/patches/series index 4eb064e..e410e20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 1580a35..c6aeaf0 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 +LIBS = @LIBS@ -lX11 # # Only if THREADS is defined. @@ -162,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE) -Wl,--enable-auto-import \ -Wl,--whole-archive ${LIBARCHIVE} \ -Wl,--no-whole-archive \ - ${LIBS} -L/usr/X11R6/lib + ${LIBS} $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 3f16ee9..f0bdecd 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -19,7 +19,7 @@ dnl Prefer headers and libraries from nx-X11, if present. if test -d "../nx-X11/exports/include" ; then CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" - LIBS="$LIBS -L../nx-X11/exports/lib" + LIBS="-L../nx-X11/exports/lib" fi dnl Check whether --with-ipaq was given. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git