diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/004_nx-x11-fix-nxcompshad-build.patch | 11 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cd4504025..b52f854c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,5 +6,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low * Add main Makefile via patch: 001_add-main-makefile.patch. * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch * Add patch: 003_nxcompshad-gcc43.patch + * Add patch: 004_nx-x11-fix-nxcompshad-build.patch. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200 diff --git a/debian/patches/004_nx-x11-fix-nxcompshad-build.patch b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch new file mode 100644 index 000000000..386dfef2e --- /dev/null +++ b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch @@ -0,0 +1,11 @@ +--- a/nx-X11/programs/Xserver/Imakefile ++++ b/nx-X11/programs/Xserver/Imakefile +@@ -1047,7 +1047,7 @@ + #else + $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) + cd $(NX_XSHADOWLIBDIR) && \ +- make ++ rm -f *.o && make + #endif + + ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ diff --git a/debian/patches/series b/debian/patches/series index 615573a8c..38a604183 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 001_add-main-makefile.patch 002_nxcompshad-build-against-nx-x11-only.patch 003_nxcompshad-gcc43.patch +004_nx-x11-fix-nxcompshad-build.patch |