From 051fc316a8f96595a89cb0698b463b2633454447 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 10 Nov 2017 06:53:00 +0000 Subject: [PATCH] Add missing file. --- ...3-Enable-infinality-subpixel-hinting.patch | 27 ++++++++++++++++ ...> 0004-Enable-long-PCF-family-names.patch} | 20 ++++++------ ...ask-subpixel-hinting-with-an-env-var.patch | 31 ------------------- 3 files changed, 37 insertions(+), 41 deletions(-) create mode 100644 lib32-freetype2/0003-Enable-infinality-subpixel-hinting.patch rename lib32-freetype2/{0003-Enable-subpixel-hinting.patch => 0004-Enable-long-PCF-family-names.patch} (51%) delete mode 100644 lib32-freetype2/0004-Mask-subpixel-hinting-with-an-env-var.patch diff --git a/lib32-freetype2/0003-Enable-infinality-subpixel-hinting.patch b/lib32-freetype2/0003-Enable-infinality-subpixel-hinting.patch new file mode 100644 index 0000000..b8f74de --- /dev/null +++ b/lib32-freetype2/0003-Enable-infinality-subpixel-hinting.patch @@ -0,0 +1,27 @@ +From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Mon, 29 Aug 2016 08:43:10 +0200 +Subject: [PATCH 3/4] Enable infinality subpixel hinting + +--- + include/freetype/config/ftoption.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 1126716626b570df..ebb44acdbbef9a47 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -684,8 +684,8 @@ FT_BEGIN_HEADER + /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ +-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ ++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) + + + /*************************************************************************/ +-- +2.13.0 + diff --git a/lib32-freetype2/0003-Enable-subpixel-hinting.patch b/lib32-freetype2/0004-Enable-long-PCF-family-names.patch similarity index 51% rename from lib32-freetype2/0003-Enable-subpixel-hinting.patch rename to lib32-freetype2/0004-Enable-long-PCF-family-names.patch index 00a5c2f..675423a 100644 --- a/lib32-freetype2/0003-Enable-subpixel-hinting.patch +++ b/lib32-freetype2/0004-Enable-long-PCF-family-names.patch @@ -1,25 +1,25 @@ -From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001 +From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" -Date: Tue, 23 Jun 2015 08:43:57 +0200 -Subject: [PATCH 3/4] Enable subpixel hinting +Date: Sun, 14 May 2017 18:09:31 +0200 +Subject: [PATCH 4/4] Enable long PCF family names --- include/freetype/config/ftoption.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index ab407e3..a2eab6a 100644 +index ebb44acdbbef9a47..0b39b417162707e4 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -602,7 +602,7 @@ FT_BEGIN_HEADER - /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ - /* defined. */ +@@ -865,7 +865,7 @@ FT_BEGIN_HEADER + /* If this option is activated, it can be controlled with the */ + /* `no-long-family-names' property of the pcf driver module. */ /* */ --/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ -+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING +-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES /*************************************************************************/ -- -2.6.0 +2.13.0 diff --git a/lib32-freetype2/0004-Mask-subpixel-hinting-with-an-env-var.patch b/lib32-freetype2/0004-Mask-subpixel-hinting-with-an-env-var.patch deleted file mode 100644 index ec89104..0000000 --- a/lib32-freetype2/0004-Mask-subpixel-hinting-with-an-env-var.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 23 Jun 2015 08:34:54 +0200 -Subject: [PATCH 4/4] Mask subpixel hinting with an env var - ---- - src/truetype/ttobjs.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c -index 6060d6f..3fa98e7 100644 ---- a/src/truetype/ttobjs.c -+++ b/src/truetype/ttobjs.c -@@ -1302,10 +1302,11 @@ - TT_Driver driver = (TT_Driver)ttdriver; - - #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING -- driver->interpreter_version = TT_INTERPRETER_VERSION_38; --#else -- driver->interpreter_version = TT_INTERPRETER_VERSION_35; -+ if ( getenv( "FT2_SUBPIXEL_HINTING" ) ) -+ driver->interpreter_version = TT_INTERPRETER_VERSION_38; -+ else - #endif -+ driver->interpreter_version = TT_INTERPRETER_VERSION_35; - - #else /* !TT_USE_BYTECODE_INTERPRETER */ - --- -2.6.0 -