aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2012-02-14 08:33:42 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 08:33:53 +0100
commit280d8751c36b6585c068a25cc180e7baa6df2019 (patch)
treeb702f2153a1c9c2bdbfe725b2822e6af5e41b38e /debian
parent165206eb288d43d68530652c31fdc26cf0bbab28 (diff)
downloadnx-libs-280d8751c36b6585c068a25cc180e7baa6df2019.tar.gz
nx-libs-280d8751c36b6585c068a25cc180e7baa6df2019.tar.bz2
nx-libs-280d8751c36b6585c068a25cc180e7baa6df2019.zip
Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/030_nx-X11_configure-args.diff52
-rw-r--r--debian/patches/series1
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 10d909f99..0ca2fee3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
configure args.
+ * Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches/030_nx-X11_configure-args.diff b/debian/patches/030_nx-X11_configure-args.diff
new file mode 100644
index 000000000..3bc910003
--- /dev/null
+++ b/debian/patches/030_nx-X11_configure-args.diff
@@ -0,0 +1,52 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2012-01-26 23:30:37.605560191 +0100
+Upstream: pending
+
+Allow to pass in configure args.
+
+---
+ nx-X11/lib/X11/Imakefile | 6 ++++--
+ nx-X11/programs/Xserver/Imakefile | 4 +++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+Index: nx-X11/lib/X11/Imakefile
+===================================================================
+--- a/nx-X11/lib/X11/Imakefile
++++ b/nx-X11/lib/X11/Imakefile
+@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h
+
+ includes:: ks_tables.h
+
++CONFIGURE=./configure
++
+ #if NXLibraries
+
+ $(NX_XCOMPCONFIGTARGET):
+ cd ../../../nxcomp && \
+- ./configure
++ ${CONFIGURE}
+
+ $(NX_XCOMPEXTCONFIGTARGET):
+ cd ../../../nxcompext && \
+- ./configure
++ ${CONFIGURE}
+
+ #ifdef SunArchitecture
+ $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
+Index: nx-X11/programs/Xserver/Imakefile
+===================================================================
+--- a/nx-X11/programs/Xserver/Imakefile
++++ b/nx-X11/programs/Xserver/Imakefile
+@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps
+ NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
+ NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
+
++CONFIGURE=./configure
++
+ $(NX_XSHADOWCONFIGTARGET):
+ cd $(NX_XSHADOWLIBDIR) && \
+- ./configure
++ ${CONFIGURE}
+
+ #ifdef SunArchitecture
+ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
diff --git a/debian/patches/series b/debian/patches/series
index 9133bf604..826e1cfcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
021_add-nxauth-wrapper.full.patch
022_add-nxproxy-wrapper.full+lite.patch
023_add-x2goagent-wrapper.full.patch
+030_nx-X11_configure-args.diff
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
102_xserver-xext_set-securitypolicy-path.debian.patch