aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/030_nx-X11_configure-args.full.patch51
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 52 deletions
diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/030_nx-X11_configure-args.full.patch
deleted file mode 100644
index 67184d330..000000000
--- a/debian/patches/030_nx-X11_configure-args.full.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Allow to pass in configure args.
- Allow to pass in configure args.
-Forward: pending
-Author: Jan Engelhardt <jengelh@medozas.de>
-Last-Update: 2012-02-14
----
- 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 de6e0905a..1288ab3f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-030_nx-X11_configure-args.full.patch
031_nx-X11_parallel-make.full.patch
051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch