aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 11:56:14 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 11:56:14 +0100
commitdd20ab5e6222bb415245829af8915259da4eae3f (patch)
tree897cc60c66f127305a7d1286fb5396d7cd1722bc
parentb3496d0a7a76cb0808bbe0f7c84355e4e88878d0 (diff)
downloadnx-libs-dd20ab5e6222bb415245829af8915259da4eae3f.tar.gz
nx-libs-dd20ab5e6222bb415245829af8915259da4eae3f.tar.bz2
nx-libs-dd20ab5e6222bb415245829af8915259da4eae3f.zip
Description: Fix build on Debian (004_nx-X11_fix-nxcompshad-build.full.patch)
By an unknown reason this patch currently is needed to build nx-X11, nxcomp, nxcompshad and nxcompext with dpkg-buildpackage and debuild.
-rw-r--r--debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch18
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/Imakefile2
3 files changed, 1 insertions, 20 deletions
diff --git a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch b/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch
deleted file mode 100644
index f65fb7877..000000000
--- a/debian/patches/004_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 @@
- #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 3dfca5e33..fef54678f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-004_nx-X11_fix-nxcompshad-build.full.patch
005_nxcomp_gcc43.full+lite.patch
006_nxcomp_libpng15.full+lite.patch
007_nxcompshad_clean-gch-files.full.patch
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 6bf7801e7..1d12173fb 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1047,7 +1047,7 @@ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
#else
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
cd $(NX_XSHADOWLIBDIR) && \
- make
+ rm -f *.o && make
#endif
ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \