From f7e6c45a57014f5da840606204872b0ea3d70e28 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 19 Nov 2011 17:30:04 +0100 Subject: Add patch: 002_nxcompshad-build-against-nx-x11-only.patch --- .../002_nxcompshad-build-against-nx-x11-only.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 debian/patches/002_nxcompshad-build-against-nx-x11-only.patch (limited to 'debian/patches/002_nxcompshad-build-against-nx-x11-only.patch') 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 000000000..975e63010 --- /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. -- cgit v1.2.3