From 3b4a915984b3136f6fddb0cdfdec01cf64715c46 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 11:46:07 +0100
Subject: 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 -
 2 files changed, 40 deletions(-)
 delete mode 100644 debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch

(limited to 'debian/patches')

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 4e92c3b04..000000000
--- 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 4eb064ea0..e410e2024 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
-- 
cgit v1.2.3