aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0053_nx-X11_no-xcomp1-install-target.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/0053_nx-X11_no-xcomp1-install-target.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/0053_nx-X11_no-xcomp1-install-target.full.patch')
-rw-r--r--debian/patches/0053_nx-X11_no-xcomp1-install-target.full.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/debian/patches/0053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/0053_nx-X11_no-xcomp1-install-target.full.patch
deleted file mode 100644
index 5455cd558..000000000
--- a/debian/patches/0053_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
-+++ 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_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
-