[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-13-g40aa275

[X2Go dev team]

The branch, master has been updated
       via  40aa275cd8c75b410a69ed82eaa10ef99d1e6d59 (commit)
      from  e3da34510db9158362be60887bf354cb6a0bfe26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40aa275cd8c75b410a69ed82eaa10ef99d1e6d59
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 6 15:20:15 2013 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    4 ++
 ...302_nx-X11_do-not-build-bundled-libs.full.patch |   39 ++++++++++++++++++++
 ...320_nxagent_configurable-keystrokes.full.patch} |    0
 debian/patches/series                              |    3 +-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch
 rename debian/patches/{302_nxagent_configurable-keystrokes.full.patch => 320_nxagent_configurable-keystrokes.full.patch} (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6c30620..9568708 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 0000000..4437aaa
--- /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 at 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
similarity index 100%
rename from debian/patches/302_nxagent_configurable-keystrokes.full.patch
rename to debian/patches/320_nxagent_configurable-keystrokes.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index ce5237f..592bcdd 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


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).