diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch | |
parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip |
Merge branch '3.6.x'
Diffstat (limited to 'debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch')
-rw-r--r-- | debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch b/debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch deleted file mode 100644 index f58aaa488..000000000 --- a/debian/patches/0002_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 @@ CCINCLUDES = - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 -+LIBS = @LIBS@ -lX11 - - # - # Only if THREADS is defined. -@@ -162,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE) - -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 @@ dnl Prefer headers and libraries from nx - - 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. |