aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 15:39:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 15:39:59 +0100
commit523d50529ee75703254084dca26ef016e54d299a (patch)
treefcf9db3e3a062462305dab704151fb133c49c89e /debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch
parent40aa275cd8c75b410a69ed82eaa10ef99d1e6d59 (diff)
downloadnx-libs-523d50529ee75703254084dca26ef016e54d299a.tar.gz
nx-libs-523d50529ee75703254084dca26ef016e54d299a.tar.bz2
nx-libs-523d50529ee75703254084dca26ef016e54d299a.zip
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.
Diffstat (limited to 'debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch')
-rw-r--r--debian/patches/302_nx-X11_do-not-build-bundled-libs.full.patch39
1 files changed, 0 insertions, 39 deletions
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 <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
-