Add patch: 302_nx-X11_do-not-build-bundled-libs.full.patch. Rename patch: 302_nxagent_configurable-keystrokes.full.patch.

* Add patch: 302_nx-X11_do-not-build-bundled-libs.full.patch. Taken from Fedora.
  Do not build bundled libraries, rather use system libraries instead.
* Rename patch: 302_nxagent_configurable-keystrokes.full.patch to
  320_nxagent_configurable-keystrokes.full.patch.

4 files changed, 45 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 6c3062036..9568708ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
   * debian/control:
     + Add libfreetype6-dev to Build-Depends: field.
   * Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch.
+  * Add patch: 302_nx-X11_do-not-build-bundled-libs.full.patch. Taken from Fedora.
+    Do not build bundled libraries, rather use system libraries instead.
+  * Rename patch: 302_nxagent_configurable-keystrokes.full.patch to
+    320_nxagent_configurable-keystrokes.full.patch.
   * nx-libs.spec:
     + Ship nx-libs.spec (RPM package definitions) in upstream project. (Thanks
       to the Fedora package maintainers). File differs from the Fedora file
diff --git a/debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch b/debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch
new file mode 100644
index 000000000..4437aaacf
--- /dev/null
+++ b/debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch
@@ -0,0 +1,39 @@
+Description: Do not build bundled libraries
+Author: Orion Poplawski <orion@nwra.com>
+--- a/nx-X11/config/cf/host.def	2013-08-30 13:23:26.000000000 -0600
++++ b/nx-X11/config/cf/host.def	2013-08-30 20:44:19.647460161 -0600
+@@ -962,7 +962,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+ 
+ #define SharedLibXdmcp         YES
+ 
+-#define BuildXaw7              YES
++#define BuildXaw7              NO
+ 
+ #else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
+ 
+@@ -1023,3 +1023,8 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+ 
+ #define BuildRman NO
+ #define BuildFontEncLib NO
++#define BuildXcursorLibrary NO
++#define BuildXftLibrary NO
++#define BuildXft1Library NO
++#define SharedLibFont NO
++#define BuildLoadableXlibI18n NO
+diff -up nx-libs-3.5.0.21/nx-X11/lib/Imakefile.bundled nx-libs-3.5.0.21/nx-X11/lib/Imakefile
+--- a/nx-X11/lib/Imakefile	2013-08-30 08:18:40.000000000 -0600
++++ b/nx-X11/lib/Imakefile	2013-08-30 20:42:40.344850909 -0600
+@@ -213,14 +213,8 @@ XEXTLIBDIR = Xext
+ 
+ #if BuildLibraries
+ OLDXLIBDIR = oldX
+-ICELIBDIR = ICE
+-SMLIBDIR = SM
+-XTLIBDIR = Xt
+-XMULIBDIR = Xmu
+-XMUULIBDIR = Xmuu
+ XPMLIBDIR = Xpm
+ XTSTLIBDIR = Xtst
+-FSLIBDIR = FS
+ #endif
+ 
diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/320_nxagent_configurable-keystrokes.full.patch
index e7a3e4a3f..e7a3e4a3f 100644
--- a/debian/patches/302_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/320_nxagent_configurable-keystrokes.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index ce5237ffd..592bcddbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,7 +44,8 @@
 220_nxproxy-bind-loopback-only.full+lite.patch
 300_nxagent_set-wm-class.full.patch
 301_nx-X11_use-shared-libs.full.patch
-302_nxagent_configurable-keystrokes.full.patch
+302_nx-X11_do-not-build-bundled-libs.full.patch
+320_nxagent_configurable-keystrokes.full.patch
 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
 602_nx-X11_initgroups.full.patch