aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-15 12:55:17 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-15 12:55:17 +0100
commit1dad092caf01d733990648e6df64cbf964df5143 (patch)
tree39de0e643e76754a3e23ca9dd0350b8ba4f76250 /debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
parent6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff)
parent2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff)
downloadnx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz
nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2
nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip
Merge branch '3.6.x'
Diffstat (limited to 'debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch')
-rw-r--r--debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch18
1 files changed, 0 insertions, 18 deletions
diff --git a/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch b/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
deleted file mode 100644
index ec38a38fa..000000000
--- a/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix build on Debian
- By an unknown reason this patch currently is needed to
- build nx-X11, nxcomp, nxcompshad and nxcompext with
- dpkg-buildpackage and debuild.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nx-X11/programs/Xserver/Imakefile
-+++ b/nx-X11/programs/Xserver/Imakefile
-@@ -1047,7 +1047,7 @@ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONF
- #else
- $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
- cd $(NX_XSHADOWLIBDIR) && \
-- make
-+ rm -f *.o && make
- #endif
-
- ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \