aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch29
-rw-r--r--debian/patches/series1
3 files changed, 32 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e437dc2d9..72601647e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
[ Orion Poplawski ]
* Fix wrong symlink direction of libNX_* files. (Fixes: #107).
+ * Avoid building of libxcomp1 (which actually is identical to libxcomp3,
+ just with a wrong name). (Fixes: #104).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100
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
new file mode 100644
index 000000000..eca4200d9
--- /dev/null
+++ b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
@@ -0,0 +1,29 @@
+--- 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 5099b997d..82977ef2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
031_nx-X11_parallel-make.full.patch
051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch
+053_nx-X11_no-xcomp1-install-target.full.patch
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
103_nxagent_set-X0-config-path.full.patch