aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrion Poplawski <orion@cora.nwra.com>2015-02-09 15:47:44 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:47:44 +0100
commit9ea734b21c6f5485b0db305fa04b023b513e2490 (patch)
tree54a9ab380c529afae3c34f0e4c98742ae871a457
parente736fff09871bbbc6101f3da444afbccd473a915 (diff)
downloadnx-libs-9ea734b21c6f5485b0db305fa04b023b513e2490.tar.gz
nx-libs-9ea734b21c6f5485b0db305fa04b023b513e2490.tar.bz2
nx-libs-9ea734b21c6f5485b0db305fa04b023b513e2490.zip
Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch).
-rw-r--r--debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch32
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/lib/X11/Imakefile11
3 files changed, 1 insertions, 43 deletions
diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
deleted file mode 100644
index acf9374e5..000000000
--- a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3)
-Author: Orion Poplawski <orion@cora.nwra.com>
-
---- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700
-+++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700
-@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
- NX_XCOMPLIBLINK = Xcomp
- NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
- NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
--NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
-
- NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext
-@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM
-
- all:: $(NX_XCOMPLIBTARGET)
-
--$(NX_XCOMPDEPTARGET):
-- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
-- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
--
- depend:: $(NX_XCOMPLIBTARGET)
-
--all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
--
--clean::
-- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
-- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
-+all:: $(NX_XCOMPEXTLIBTARGET)
-
- #endif
-
diff --git a/debian/patches/series b/debian/patches/series
index 138d87ae9..5e2e29e68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-053_nx-X11_no-xcomp1-install-target.full.patch
054_nx-X11_ppc64-ftbfs.full.patch
055_nx-X11_imake-Werror-format-security.full.patch
056_nx-X11_Werror-format-security.full.patch
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index cad223f1c..c0ae81071 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
NX_XCOMPLIBLINK = Xcomp
NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
-NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext
@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
all:: $(NX_XCOMPLIBTARGET)
-$(NX_XCOMPDEPTARGET):
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
-
depend:: $(NX_XCOMPLIBTARGET)
-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
-
-clean::
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+all:: $(NX_XCOMPEXTLIBTARGET)
#endif