[X2Go-Commits] [nx-libs] 06/14: Do not build bundled libraries (601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch).
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 13 13:59:11 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 456f887d95ca34974c1192a477dfca117827457f
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Feb 13 13:30:31 2015 +0100
Do not build bundled libraries (601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch).
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.
---
...changes-to-not-use-bundled-libraries.full.patch | 99 --------------------
debian/patches/series | 1 -
nx-X11/config/cf/host.def | 17 +++-
nx-X11/lib/Imakefile | 6 --
nx-X11/lib/font/include/Imakefile | 2 +-
5 files changed, 14 insertions(+), 111 deletions(-)
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
deleted file mode 100644
index dbb2e85..0000000
--- a/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Description: Do not build bundled libraries.
-Author: Orion Poplawski <orion at nwra.com>
-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 +-
- 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
-@@ -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 @@
- 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::
---- 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 6a20a8f..21cf21d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
602_nx-X11_initgroups.full.patch
603_nx-X11_compilation_warnings.full.patch
605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 2193a47..9b482c6 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -311,6 +311,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define BuildFreeType NO
*/
+#define BuildFreeType NO
/*
* To set non-default build options for the underlying FreeType libraries,
@@ -892,7 +893,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define HasFreetype2 NO
*/
-#define HasFreetype2 NO
+#define HasFreetype2 YES
/*
* To use a FreeType library already installed outside the default search
@@ -909,7 +910,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define HasFontconfig NO
*/
-#define HasFontconfig NO
+#define HasFontconfig YES
/*
* To use a Fontconfig library already installed outside the default search
@@ -925,7 +926,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define HasExpat NO
*/
-#define HasExpat NO
+#define HasExpat YES
/*
* To use a Expat library already installed outside the default search
@@ -961,7 +962,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define SharedLibXdmcp YES
-#define BuildXaw7 YES
+#define BuildXaw7 NO
#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
@@ -1019,3 +1020,11 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#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
diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile
index 240e8b3..cf4109b 100644
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -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/nx-X11/lib/font/include/Imakefile b/nx-X11/lib/font/include/Imakefile
index 91c84e6..73e65a4 100644
--- 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::
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list