aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
commit09d2732b4e299eaa06c64b7a683529e337691c59 (patch)
tree3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch
parent8c98a401b49506f969dc9263d9bd566e5b31a572 (diff)
downloadnx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch')
-rw-r--r--debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch39
1 files changed, 0 insertions, 39 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 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.