aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:30:04 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:30:04 +0100
commitf7e6c45a57014f5da840606204872b0ea3d70e28 (patch)
tree169fd88f9b56f6bb7af0f7c863bce5a8caffa043 /debian/patches
parent954557e9014e14df2468ff5c0e08b7ef533bb071 (diff)
downloadnx-libs-f7e6c45a57014f5da840606204872b0ea3d70e28.tar.gz
nx-libs-f7e6c45a57014f5da840606204872b0ea3d70e28.tar.bz2
nx-libs-f7e6c45a57014f5da840606204872b0ea3d70e28.zip
Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/002_nxcompshad-build-against-nx-x11-only.patch32
-rw-r--r--debian/patches/series1
2 files changed, 33 insertions, 0 deletions
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.
diff --git a/debian/patches/series b/debian/patches/series
index 9a8f69823..84fa73008 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