From a296738ed8d156709e27ae5d5ca7f9be20bb53d8 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Tue, 19 Sep 2017 23:37:18 +0200 Subject: main/freetype: remove unused patches --- main/freetype/freetype-2.8-loop-counter.patch | 36 ----------------- main/freetype/freetype-2.8-pcf-encoding.patch | 58 --------------------------- 2 files changed, 94 deletions(-) delete mode 100644 main/freetype/freetype-2.8-loop-counter.patch delete mode 100644 main/freetype/freetype-2.8-pcf-encoding.patch diff --git a/main/freetype/freetype-2.8-loop-counter.patch b/main/freetype/freetype-2.8-loop-counter.patch deleted file mode 100644 index 61e9052876..0000000000 --- a/main/freetype/freetype-2.8-loop-counter.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8d435c463d22f6de35015b244d6f9bb433beb7e6 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Thu, 1 Jun 2017 07:09:44 +0200 -Subject: [PATCH] * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter - again. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Marek Kašík . - -The problematic font that exceeds the old limit is Padauk-Bold, -version 3.002, containing bytecode generated by a buggy version of -ttfautohint. ---- - ChangeLog | 10 ++++++++++ - src/truetype/ttinterp.c | 3 +-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index 0c48c256..775d1104 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7649,8 +7649,7 @@ - FT_MAX( 50, - exc->cvtSize / 10 ); - else -- exc->loopcall_counter_max = FT_MAX( 100, -- 10 * exc->cvtSize ); -+ exc->loopcall_counter_max = 300 + 8 * exc->cvtSize; - - /* as a protection against an unreasonable number of CVT entries */ - /* we assume at most 100 control values per glyph for the counter */ --- -2.13.0 - diff --git a/main/freetype/freetype-2.8-pcf-encoding.patch b/main/freetype/freetype-2.8-pcf-encoding.patch deleted file mode 100644 index fd1c7061ef..0000000000 --- a/main/freetype/freetype-2.8-pcf-encoding.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Wed, 24 May 2017 07:40:46 +0200 -Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka - ASCII). -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Marek Kašík , cf. - - https://bugzilla.redhat.com/show_bug.cgi?id=1451795 - -* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c -(PCF_Face_Init): Implement it. ---- - ChangeLog | 11 +++++++++++ - src/bdf/bdfdrivr.c | 6 +++++- - src/pcf/pcfdrivr.c | 6 +++++- - 3 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c -index a2242be0..c0a5a5c5 100644 ---- a/src/bdf/bdfdrivr.c -+++ b/src/bdf/bdfdrivr.c -@@ -545,7 +545,11 @@ THE SOFTWARE. - if ( !ft_strcmp( s, "10646" ) || - ( !ft_strcmp( s, "8859" ) && - !ft_strcmp( face->charset_encoding, "1" ) ) ) -- unicode_charmap = 1; -+ unicode_charmap = 1; -+ /* another name for ASCII */ -+ else if ( !ft_strcmp( s, "646.1991" ) && -+ !ft_strcmp( face->charset_encoding, "IRV" ) ) -+ unicode_charmap = 1; - } - - { -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 9f4d36d1..50530941 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -387,7 +387,11 @@ THE SOFTWARE. - if ( !ft_strcmp( s, "10646" ) || - ( !ft_strcmp( s, "8859" ) && - !ft_strcmp( face->charset_encoding, "1" ) ) ) -- unicode_charmap = 1; -+ unicode_charmap = 1; -+ /* another name for ASCII */ -+ else if ( !ft_strcmp( s, "646.1991" ) && -+ !ft_strcmp( face->charset_encoding, "IRV" ) ) -+ unicode_charmap = 1; - } - } - --- -2.13.0 - -- cgit v1.2.3