From 523d50529ee75703254084dca26ef016e54d299a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 6 Dec 2013 15:39:59 +0100 Subject: Improve patch: 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch. Improvements taken from the current Fedora package. Thanks to Orion Paplowski!!! Also adapt roll-tarball.sh do dropping more bundled libraries. --- debian/changelog | 7 +++- ...302_nx-X11_do-not-build-bundled-libs.full.patch | 39 ------------------ ...changes-to-not-use-bundled-libraries.full.patch | 48 +++++++++++++++++++--- debian/patches/series | 2 +- debian/roll-tarballs.sh | 2 +- 5 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch diff --git a/debian/changelog b/debian/changelog index 9568708ad..0c19fd24a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,11 @@ 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. + * Improve patch: + 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch. + Improvements taken from the current Fedora package. Thanks to Orion + Paplowski!!! Also adapt roll-tarball.sh do dropping more bundled + libraries. * Rename patch: 302_nxagent_configurable-keystrokes.full.patch to 320_nxagent_configurable-keystrokes.full.patch. * nx-libs.spec: 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 deleted file mode 100644 index 4437aaacf..000000000 --- a/debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Do not build bundled libraries -Author: Orion Poplawski ---- 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/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 index 68a825413..dbb2e85b0 100644 --- 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 @@ -1,8 +1,13 @@ -From e3569945417272ea2556d4b77b6bc041fdea885f Mon Sep 17 00:00:00 2001 -From: Orion Poplawski -Date: Wed, 10 Jul 2013 14:09:45 -0600 -Subject: [PATCH 2/2] Build option changes to not use bundled libraries - +Description: Do not build bundled libraries. +Author: Orion Poplawski +Abstract: + This commit has been submitted by Orion in two + portions. One was submitted to X2Go BTS and created + on Wed, 10 Jul 2013. + . + The other portion has been taken from the Fedora + package by Mike Gabriel and worked into this + patch on Fri, 06 Dec 2013. --- nx-X11/config/cf/host.def | 10 +++++++--- nx-X11/lib/font/include/Imakefile | 2 +- @@ -45,13 +50,27 @@ Subject: [PATCH 2/2] Build option changes to not use bundled libraries /* * To use a Expat library already installed outside the default search -@@ -1019,3 +1020,6 @@ +@@ -961,7 +962,7 @@ + + #define SharedLibXdmcp YES + +-#define BuildXaw7 YES ++#define BuildXaw7 NO + + #else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ + +@@ -1019,3 +1020,11 @@ #endif #endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ + +#define BuildRman NO +#define BuildFontEncLib NO ++#define BuildXcursorLibrary NO ++#define BuildXftLibrary NO ++#define BuildXft1Library NO ++#define SharedLibFont NO ++#define BuildLoadableXlibI18n NO --- a/nx-X11/lib/font/include/Imakefile +++ b/nx-X11/lib/font/include/Imakefile @@ -1,5 +1,5 @@ @@ -61,3 +80,20 @@ Subject: [PATCH 2/2] Build option changes to not use bundled libraries fontencc.h fontmisc.h fontmod.h fontshow.h fontutil.h \ fontxlfd.h all:: +--- a/nx-X11/lib/Imakefile ++++ b/nx-X11/lib/Imakefile +@@ -213,14 +213,8 @@ + + #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/series b/debian/patches/series index 592bcddbd..b970eb729 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,7 +44,7 @@ 220_nxproxy-bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch -302_nx-X11_do-not-build-bundled-libs.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 diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 7c1fc67e2..eb106b6b6 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -136,7 +136,7 @@ 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} - +rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu} # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* -- cgit v1.2.3