From e46b43443fd45fa3f3196df34ba7efe8bff423a3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 29 Aug 2013 20:48:09 +0200 Subject: fix underscore in name of patch 601_... --- ...changes-to-not-use-bundled-libraries.full.patch | 63 ---------------------- ...changes-to-not-use-bundled-libraries.full.patch | 63 ++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch create mode 100644 debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 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 68a825413..000000000 --- a/debian/patches/601-nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 - ---- - 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/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 +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 4dfe8ca5d..2d95bf5b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,7 +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 +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 -- cgit v1.2.3