The branch, master has been updated via f7e6c45a57014f5da840606204872b0ea3d70e28 (commit) from 954557e9014e14df2468ff5c0e08b7ef533bb071 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7e6c45a57014f5da840606204872b0ea3d70e28 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 19 17:30:04 2011 +0100 Add patch: 002_nxcompshad-build-against-nx-x11-only.patch ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../002_nxcompshad-build-against-nx-x11-only.patch | 32 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 debian/patches/002_nxcompshad-build-against-nx-x11-only.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1f893e7..bbee930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,5 +4,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low * Use NX adapted LD_LIBRARY_PATH in debian/rules. * Add quilt as build dependency. * Add main Makefile via patch: 001_add-main-makefile.patch. + * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200 diff --git a/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch new file mode 100644 index 0000000..975e630 --- /dev/null +++ b/debian/patches/002_nxcompshad-build-against-nx-x11-only.patch @@ -0,0 +1,32 @@ +Build nxcompshad against own nx-X11 sources instead of the system's X11. +--- 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 9a8f698..84fa730 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 001_add-main-makefile.patch +002_nxcompshad-build-against-nx-x11-only.patch hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).