[X2Go-Commits] [nx-libs] 26/29: Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 9ea734b21c6f5485b0db305fa04b023b513e2490
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Feb 9 15:47:44 2015 +0100

    Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch).
---
 .../053_nx-X11_no-xcomp1-install-target.full.patch |   32 --------------------
 debian/patches/series                              |    1 -
 nx-X11/lib/X11/Imakefile                           |   11 +------
 3 files changed, 1 insertion(+), 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 acf9374..0000000
--- 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 at 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 138d87a..5e2e29e 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 cad223f..c0ae810 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
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git