diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch | 63 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 4 |
4 files changed, 74 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 32c471210..4c68399ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). * Use a keystrokes.cfg that reflects the normally hard-coded defaults of @@ -10,6 +11,11 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low + Only install keystrokes.cfg when in full mode. + Only install nxproxy wrapper when in lite mode. + [ Orion Poplawski ] + * Change build options so that bundled libraries are not used anymore at + build time. Remove bundled libraries from rolled tarballs, as well. (Fixes: + #238). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Mar 2013 21:07:42 +0100 nx-libs (2:3.5.0.20-0) unstable; urgency=low diff --git a/debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch b/debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch new file mode 100644 index 000000000..68a825413 --- /dev/null +++ b/debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch @@ -0,0 +1,63 @@ +From e3569945417272ea2556d4b77b6bc041fdea885f Mon Sep 17 00:00:00 2001 +From: Orion Poplawski <orion@nwra.com> +Date: Wed, 10 Jul 2013 14:09:45 -0600 +Subject: [PATCH 2/2] Build option changes to not use bundled libraries + +--- + nx-X11/config/cf/host.def | 10 +++++++--- + nx-X11/lib/font/include/Imakefile | 2 +- + 2 files changed, 8 insertions(+), 4 deletions(-) + +--- a/nx-X11/config/cf/host.def ++++ b/nx-X11/config/cf/host.def +@@ -311,6 +311,7 @@ + * + #define BuildFreeType NO + */ ++#define BuildFreeType NO + + /* + * To set non-default build options for the underlying FreeType libraries, +@@ -892,7 +893,7 @@ + * + #define HasFreetype2 NO + */ +-#define HasFreetype2 NO ++#define HasFreetype2 YES + + /* + * To use a FreeType library already installed outside the default search +@@ -909,7 +910,7 @@ + * + #define HasFontconfig NO + */ +-#define HasFontconfig NO ++#define HasFontconfig YES + + /* + * To use a Fontconfig library already installed outside the default search +@@ -925,7 +926,7 @@ + * + #define HasExpat NO + */ +-#define HasExpat NO ++#define HasExpat YES + + /* + * To use a Expat library already installed outside the default search +@@ -1019,3 +1020,6 @@ + #endif + + #endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ ++ ++#define BuildRman NO ++#define BuildFontEncLib NO +--- a/nx-X11/lib/font/include/Imakefile ++++ b/nx-X11/lib/font/include/Imakefile +@@ -1,5 +1,5 @@ + XCOMM $Xorg$ +- HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h fontenc.h \ ++ HEADERS = bitmap.h bufio.h fntfil.h fntfilio.h fntfilst.h \ + fontencc.h fontmisc.h fontmod.h fontshow.h fontutil.h \ + fontxlfd.h + all:: diff --git a/debian/patches/series b/debian/patches/series index 82977ef2c..4dfe8ca5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,6 +46,7 @@ 301_nx-X11_use-shared-libs.full.patch 302_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 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index fd36b281d..7c1fc67e2 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -133,6 +133,10 @@ test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefil # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" +# bundled libraries we do not need +rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} +rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} + # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* |