diff options
Diffstat (limited to 'third_party/freetype/0000-include.patch')
| -rw-r--r-- | third_party/freetype/0000-include.patch | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/third_party/freetype/0000-include.patch b/third_party/freetype/0000-include.patch index d7478e7811..d6c837471c 100644 --- a/third_party/freetype/0000-include.patch +++ b/third_party/freetype/0000-include.patch @@ -1,28 +1,6 @@ -diff -ru freetype-2.6.1/include/freetype/config/ftmodule.h include/freetype/config/ftmodule.h ---- freetype-2.6.1/include/freetype/config/ftmodule.h 2015-11-05 13:52:36.734733186 -0800 -+++ include/freetype/config/ftmodule.h 2015-11-05 13:44:54.445479822 -0800 -@@ -1,3 +1,20 @@ -+/***************************************************************************/ -+/* */ -+/* ftmodule.h */ -+/* */ -+/* FreeType modules public interface (specification). */ -+/* */ -+/* Copyright 1996-2001, 2002, 2003 by */ -+/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -+/* */ -+/* This file is part of the FreeType project, and may only be used, */ -+/* modified, and distributed under the terms of the FreeType project */ -+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -+/* this file you indicate that you have read the license and */ -+/* understand and accept it fully. */ -+/* */ -+/***************************************************************************/ -+ - /* - * This file registers the FreeType modules compiled into the library. - * -@@ -10,15 +27,15 @@ +--- third_party/freetype/include/freetype/config/ftmodule.h 2017-03-07 20:15:52.781636524 -0800 ++++ third_party/freetype/include/freetype/config/ftmodule.h 2017-03-22 22:57:58.536233071 -0700 +@@ -10,15 +10,15 @@ * */ @@ -43,7 +21,7 @@ diff -ru freetype-2.6.1/include/freetype/config/ftmodule.h include/freetype/conf FT_USE_MODULE( FT_Module_Class, psaux_module_class ) FT_USE_MODULE( FT_Module_Class, psnames_module_class ) FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) -@@ -27,6 +44,6 @@ +@@ -27,6 +27,6 @@ FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class ) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) @@ -51,10 +29,9 @@ diff -ru freetype-2.6.1/include/freetype/config/ftmodule.h include/freetype/conf +//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) /* EOF */ -diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/config/ftoption.h ---- freetype-2.6.1/include/freetype/config/ftoption.h 2015-11-05 13:52:36.734733186 -0800 -+++ include/freetype/config/ftoption.h 2015-11-05 13:44:54.445479822 -0800 -@@ -92,7 +92,7 @@ +--- third_party/freetype/include/freetype/config/ftoption.h 2017-03-07 20:15:52.781636524 -0800 ++++ third_party/freetype/include/freetype/config/ftoption.h 2017-03-22 22:57:58.532233095 -0700 +@@ -122,7 +122,7 @@ /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ @@ -63,16 +40,16 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -@@ -163,7 +163,7 @@ +@@ -193,7 +193,7 @@ /* Define this macro if you want to enable this `feature'. See also */ /* the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below. */ /* */ -#define FT_CONFIG_OPTION_USE_ZLIB -+//#define FT_CONFIG_OPTION_USE_ZLIB ++#undef FT_CONFIG_OPTION_USE_ZLIB /*************************************************************************/ -@@ -336,7 +336,7 @@ +@@ -366,7 +366,7 @@ /* */ /* Note that the `FOND' resource isn't checked. */ /* */ @@ -81,7 +58,7 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -@@ -512,7 +512,7 @@ +@@ -556,7 +556,7 @@ /* embedded bitmaps in all formats using the SFNT module (namely */ /* TrueType & OpenType). */ /* */ @@ -90,7 +67,7 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -@@ -681,7 +681,7 @@ +@@ -705,7 +705,7 @@ /* and avar tables). This has many similarities to Type 1 Multiple */ /* Masters support. */ /* */ @@ -99,7 +76,7 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -@@ -689,7 +689,7 @@ +@@ -713,7 +713,7 @@ /* Define TT_CONFIG_OPTION_BDF if you want to include support for */ /* an embedded `BDF ' table within SFNT-based bitmap formats. */ /* */ @@ -108,7 +85,7 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -@@ -725,7 +725,7 @@ +@@ -767,7 +767,7 @@ /* */ /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */ /* */ @@ -117,4 +94,3 @@ diff -ru freetype-2.6.1/include/freetype/config/ftoption.h include/freetype/conf /*************************************************************************/ -Only in freetype-2.6.1/include/freetype: ftchapters.h |