Backed out 16 changesets (bug 1364714) for android reftest failures in out-of-bounds-selectedindex.html a=backout

Backed out changeset b00b74e9d34b (bug 1364714) Backed out changeset 1f52db2530d3 (bug 1364714) Backed out changeset e3dda4fe9dae (bug 1364714) Backed out changeset ff188112de35 (bug 1364714) Backed out changeset 0e26a8c07cae (bug 1364714) Backed out changeset e0cf94cb8666 (bug 1364714) Backed out changeset 6f758a7673d3 (bug 1364714) Backed out changeset 4b915e42b36d (bug 1364714) Backed out changeset 80ca8faf1dac (bug 1364714) Backed out changeset 2bd5a2d0ea09 (bug 1364714) Backed out changeset aa5a89aac5ea (bug 1364714) Backed out changeset 7634973c46ad (bug 1364714) Backed out changeset b02a1d99e603 (bug 1364714) Backed out changeset a297dc40177e (bug 1364714) Backed out changeset 40e902ed7dbe (bug 1364714) Backed out changeset d653fc499c9b (bug 1364714) MozReview-Commit-ID: AyHF7oPwAs4
2017-08-21 16:16:29 -07:00 · 2017-08-21 16:16:29 -07:00 · 7459418fd6
--- a/gfx/layers/apz/test/reftest/reftest.list
+++ b/gfx/layers/apz/test/reftest/reftest.list
@ -1,16 +1,16 @@
 # The following tests test the async positioning of the scrollbars.
 # Basic root-frame scrollbar with async scrolling
-fuzzy-if(Android,43-43,8-8) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html # bug 1392259
+fuzzy-if(Android,1,2) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
 fuzzy-if(Android,4,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
 fuzzy-if(Android,3,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
-fuzzy-if(Android,43-43,8-8) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html # bug 1392259
+fuzzy-if(Android,1,2) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
 fuzzy-if(Android,4,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
 fuzzy-if(Android,3,7) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
 # Different async zoom levels. Since the scrollthumb gets async-scaled in the
 # compositor, the border-radius ends of the scrollthumb are going to be a little
 # off, hence the fuzzy-if clauses.
-fuzzy-if(Android,54,20) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
+fuzzy-if(Android,54,18) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
 fuzzy-if(Android,45,22) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2-ref.html
 # Meta-viewport tag support
--- a/layout/reftests/css-break/reftest.list
+++ b/layout/reftests/css-break/reftest.list
@ -2,7 +2,7 @@ default-preferences pref(layout.css.box-decoration-break.enabled,true)
 == box-decoration-break-1.html box-decoration-break-1-ref.html
 fuzzy(1,20) fuzzy-if(skiaContent,1,700) fuzzy-if(webrender,4-4,3273-3273) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
-fuzzy(16,460) fuzzy-if(skiaContent,57,374) fuzzy-if(Android,57,1330) fuzzy-if(styloVsGecko,2,1410) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543
+fuzzy(16,460) fuzzy-if(Android,10,3673) fuzzy-if(skiaContent,57,374) fuzzy-if(styloVsGecko,2,1410) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543
 random-if(!gtkWidget) HTTP(..) == box-decoration-break-border-image.html box-decoration-break-border-image-ref.html
 == box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding-ref.html
 == box-decoration-break-block-margin.html box-decoration-break-block-margin-ref.html
--- a/layout/reftests/css-ruby/justification-1-ref.html
+++ b/layout/reftests/css-ruby/justification-1-ref.html
@ -5,7 +5,7 @@
  <title>Bug 1116631 - Justification with ruby span</title>
  <link rel="stylesheet" href="common.css">
  <style>
-    body { line-height: 3; }
+    body { line-height: 2; }
  </style>
 </head>
 <body>
--- a/layout/reftests/css-ruby/justification-1.html
+++ b/layout/reftests/css-ruby/justification-1.html
@ -5,7 +5,7 @@
  <title>Bug 1116631 - Justification with ruby span</title>
  <link rel="stylesheet" href="common.css">
  <style>
-    body { line-height: 3; }
+    body { line-height: 2; }
  </style>
 </head>
 <body>
--- a/layout/reftests/css-ruby/ruby-reflow-1-noruby.html
+++ b/layout/reftests/css-ruby/ruby-reflow-1-noruby.html
@ -8,7 +8,7 @@
 <meta charset="UTF-8">
 <link rel="stylesheet" href="common.css">
 <style>
-body { line-height: 3; }
+body { line-height: 2em; }
 </style>
 </head>
 <body>
--- a/layout/reftests/css-ruby/ruby-reflow-1-transparentruby.html
+++ b/layout/reftests/css-ruby/ruby-reflow-1-transparentruby.html
@ -8,7 +8,7 @@
 <meta charset="UTF-8">
 <link rel="stylesheet" href="common.css">
 <style>
-body { line-height: 3; }
+body { line-height: 2em; }
 rtc { color: transparent; }
 </style>
 </head>
--- a/layout/reftests/floats/orthogonal-floats-1a.html
+++ b/layout/reftests/floats/orthogonal-floats-1a.html
@ -44,8 +44,7 @@
  <div class="floated-right">rstuv</div>
-  <div class="floated-right">wxxz!</div>
+  <div class="floated-right">wxyz!</div>
    <!-- bug 1364714, replace 'y' with 'x' to avoid descender possibly projecting -->
  <div id="reference-overlapped-red"></div>
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@ -205,7 +205,7 @@ random-if(winWidget&&!d2d) == opentype-stretchy.html opentype-stretchy-ref.html
 == operator-1.xhtml operator-1-ref.xhtml
 == scriptshift-1.xhtml scriptshift-1-ref.xhtml
 == number-size-1.xhtml number-size-1-ref.xhtml
-fuzzy-if(skiaContent,1,80) fuzzy-if(Android,255,105) skip-if(winWidget) == multiscripts-1.html multiscripts-1-ref.html # Windows: bug 1314684; Android: bug 1392254
+fuzzy-if(skiaContent,1,80) skip-if(winWidget) == multiscripts-1.html multiscripts-1-ref.html # Windows: bug 1314684
 == mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html
 == mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html
 != menclose-1a.html menclose-1-ref.html
--- a/layout/reftests/position-relative/table-collapse-4-ref.html
+++ b/layout/reftests/position-relative/table-collapse-4-ref.html
@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <head>
  <style>
    html {
      line-height: 1.25;
    }
    body {
      background-color: white;
      margin: 0;
--- a/layout/reftests/position-relative/table-collapse-4.html
+++ b/layout/reftests/position-relative/table-collapse-4.html
@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <head>
  <style>
    html {
      line-height: 1.25;
    }
    body {
      background-color: white;
      margin: 0;
--- a/layout/reftests/position-relative/table-separate-4-ref.html
+++ b/layout/reftests/position-relative/table-separate-4-ref.html
@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <head>
  <style>
    html {
      line-height: 1.25;
    }
    body {
      background-color: white;
      margin: 0;
--- a/layout/reftests/position-relative/table-separate-4.html
+++ b/layout/reftests/position-relative/table-separate-4.html
@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <head>
  <style>
    html {
      line-height: 1.25;
    }
    body {
      background-color: white;
      margin: 0;
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@ -58,5 +58,5 @@ fuzzy-if(d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-
 == scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-notref.html # scrolling rowgroups were removed in bug 28800
 == empty-cells-default-1.html empty-cells-default-1-ref.html
 == empty-cells-default-2.html empty-cells-default-2-ref.html
-fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,84,5500) fuzzy-if(Android,2,5957) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
+fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(Android,1,39) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,84,5500) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
 == table-row-opacity-dynamic-2.html table-row-opacity-dynamic-2-ref.html
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@ -29,7 +29,7 @@ HTTP(..) == lineheight-metrics-2a.html lineheight-metrics-2-ref.html
 HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2-ref.html
 == lineheight-percentage-1.html lineheight-percentage-1-ref.html
 == long-1.html long-ref.html
-fuzzy-if(Android,255,325) == pre-line-1.html pre-line-1-ref.html
+fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1-ref.html
 == pre-line-2.html pre-line-2-ref.html
 == pre-line-3.html pre-line-3-ref.html
 == pre-line-4.html pre-line-4-ref.html
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001-ref.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-gap-001-ref.xht
@ -6,7 +6,7 @@
  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-05 -->
  <meta name="flags" content="image" />
  <style type="text/css"><![CDATA[
-  div {margin: 1.25em; line-height: 1;}
+  div {margin: 1.25em;}
  img {vertical-align: top;}
  ]]></style>
--- a/layout/reftests/w3c-css/received/css-writing-modes-3/background-position-vrl-018-ref.xht
+++ b/layout/reftests/w3c-css/received/css-writing-modes-3/background-position-vrl-018-ref.xht
@ -11,11 +11,6 @@
  <meta content="image" name="flags" />
  <style type="text/css"><![CDATA[
  html
    {
      line-height: 1;
    }
  div#expected
    {
      text-align: right;
--- a/layout/reftests/w3c-css/submitted/text-decor-3/text-emphasis-line-height-001z.html
+++ b/layout/reftests/w3c-css/submitted/text-decor-3/text-emphasis-line-height-001z.html
@ -10,8 +10,6 @@
 textarea {
  all: inherit;
  width: 100%;
  height: 10em; /* ensure there's plenty of height even if the default font is quite tall,
                   to avoid risk of a vertical scrollbar showing up inside textarea */
  box-sizing: border-box;
  border: 0 none; margin: 0; padding: 0;
 }
--- a/layout/reftests/writing-mode/tables/fixed-table-layout-010-ref.html
+++ b/layout/reftests/writing-mode/tables/fixed-table-layout-010-ref.html
@ -8,8 +8,8 @@
 .test { writing-mode: vertical-lr; text-orientation: sideways-right; }
  div.stripe
  {
-    width: 2em;
+    width: 20px;
-    line-height: 2em;
+    line-height: 20px;
    height: 200px;
  }
  div.blue {background-color: blue; }
--- a/layout/reftests/writing-mode/tables/fixed-table-layout-010-vlr.html
+++ b/layout/reftests/writing-mode/tables/fixed-table-layout-010-vlr.html
@ -22,7 +22,7 @@
                background: blue;
                color: blue;
                padding: 0;
-                width: 2em;
+                width: 20px;
            }
            #overflow
            {
@ -33,7 +33,7 @@
            #div1
            {
                background: black;
-                width: 2em;
+                width: 20px;
            }
            table, .row1
            {
--- a/layout/reftests/writing-mode/tables/fixed-table-layout-010-vrl.html
+++ b/layout/reftests/writing-mode/tables/fixed-table-layout-010-vrl.html
@ -22,7 +22,7 @@
                background: blue;
                color: blue;
                padding: 0;
-                width: 2em;
+                width: 20px;
            }
            #overflow
            {
@ -33,7 +33,7 @@
            #div1
            {
                background: black;
-                width: 2em;
+                width: 20px;
            }
            table, .row1
            {
--- a/modules/freetype2/CMakeLists.txt
+++ b/modules/freetype2/CMakeLists.txt
@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright 2013-2017 by
+# Copyright 2013-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <cary@txcorp.com>
@ -153,8 +153,8 @@ endif ()
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "8")
+set(VERSION_MINOR "7")
-set(VERSION_PATCH "0")
+set(VERSION_PATCH "1")
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
--- a/modules/freetype2/ChangeLog
+++ b/modules/freetype2/ChangeLog
--- a/modules/freetype2/ChangeLog.20
+++ b/modules/freetype2/ChangeLog.20
@ -1338,7 +1338,7 @@
 	(cff_compute_bias): Use `U' for constant.
 	* src/cid/cidload.c (cid_decrypt): Ditto.
 	* src/psaux/psobjs.c (T1_Decrypt): Ditto.
-	* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
+	* src/psaux/t1decode.c (T1_Decoder_Parse_CharStrings): Ditto.
 	* src/sfnt/ttload.c (TT_Load_Kern): Remove unused `version'
 	variable.
 	* src/sfnt/ttsbit.c (TT_Load_SBit_Image): Remove unused `top'
@ -1524,7 +1524,7 @@
 	* src/base/ftcalc.c (FT_DivFix): Fixed a bug in the 64-bit code that
 	created incorrect scale factors!
-	(FT_RoundFix, FT_CeilFix, FT_FloorFix): Minor improvements.
+	(FT_Round_Fix, FT_CeilFix, FT_FloorFix): Minor improvements.
 2001-05-12  Werner Lemberg  <wl@gnu.org>
@ -2159,7 +2159,7 @@
 	* include/freetype/internal/t2types.h,
 	include/freetype/internal/cfftypes.h: Changed the structures for
-	CFF_Charset and CFF_Encoding for the new implementations of the
+	CFF_Encoding and CFF_Encoding for the new implementations of the
 	charset and encoding parsers in the CFF driver.
 	* src/cff/t2gload.c (t2_lookup_glyph_by_stdcharcode,
@ -2597,7 +2597,7 @@
 ----------------------------------------------------------------------------
-Copyright 2000-2017 by
+Copyright 2000-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.21
+++ b/modules/freetype2/ChangeLog.21
@ -170,7 +170,7 @@
 	FTC_CACHE_TRYLOOP_END): New macros.
 	* src/cache/ftccache.c (FTC_Cache_NewNode), src/cache/ftcsbits.c
-	(ftc_snode_compare): Use FT_CACHE_TRYLOOP and FTC_CACHE_TRYLOOP_END.
+	(ftc_snode_compare): Use FT_CACHE_TRYLOOP and FTC_CACE_TRYLOOP_END.
 2005-05-23  Werner Lemberg  <wl@gnu.org>
@ -617,7 +617,7 @@
 	`ft_get_adobe_glyph_index', a new function defined in `pstables.h'.
 	(ps_get_macintosh_name, ps_get_standard_strings): Updated.
-	* src/base/ftobjs.c (FT_Set_Char_Size): Handle fractional sizes
+	* src/base/ftobjs.c (FT_Set_Char_Sizes): Handle fractional sizes
 	more carefully.  This fixes Savannah bug #12263.
 2005-03-06  David Turner  <david@freetype.org>
@ -1819,7 +1819,7 @@
 2004-08-11  Detlef Würkner  <TetiSoft@apg.lahn.de>
 	* src/base/ftrfork.c (FT_Raccess_Guess)
-	[!FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK]: Remove compiler
+	[!FT_CONFIG_OPTION_GUESSING_EMBEDDED_FORK]: Remove compiler
 	warnings.
 2004-08-06  Adam Piotrowski  <st_intel@poczta.onet.pl>
@ -2101,7 +2101,7 @@
 2004-06-08  David Turner  <david@freetype.org>
-	* include/freetype/freetype.h (FT_Glyph_Metrics): Move `lsb_delta'
+	* include/freetype/freetype.h (FT_GlyphMetrics): Move `lsb_delta'
 	and `rsb_delta' elements to...
 	(FT_GlyphSlotRec): Here to retain binary compatibility with older
 	FreeType versions.
@ -2528,7 +2528,7 @@
 	* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
 	ttgxvar.h.
 	(TT_Process_Simple_Glyph, load_truetype_glyph)
-	[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Support GX var fonts.
+	[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
 	* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
 	ttgxvar.h.
@ -2864,7 +2864,7 @@
 	(psh_blues_snap_stem): Don't use blue_shift but blue_threshold.
 	* src/pshinter/pshalgo.c (PSH_STRONG_THRESHOLD_MAXIMUM): New macro.
-	(psh_glyph_find_strong_points): Use PSH_STRONG_THRESHOLD_MAXIMUM.
+	(psh_glyph_find_string_points): Use PSH_STRONG_THRESHOLD_MAXIMUM.
 	(psh_glyph_find_blue_points): New function.  Needed for fonts like
 	p052003l.pfb (URW Palladio L Roman) which have flex curves at the
 	base line within blue zones, but the flex curves aren't covered by
@ -3361,7 +3361,7 @@
 	* src/base/ftstroke.c: Include FT_INTERNAL_OBJECTS_H.
 	(FT_Outline_GetOutsideBorder): Inverse result.
-	(FT_Stroker_Rewind, FT_Glyph_Stroke, FT_Glyph_StrokeBorder): New
+	(FT_Stroker_Rewind, FT_Glyph_Stroke, FT_GlyphStrokeBorder): New
 	functions.
 	(FT_Stroker_EndSubPath): Close path if needed.
 	(FT_Stroker_Set, FT_Stroker_ParseOutline): Use FT_Stroker_Rewind.
@ -3493,8 +3493,8 @@
 2003-12-23  David Turner  <david@freetype.org>
 	* include/freetype/internal/ftobjs.h (FT_PAD_FLOOR, FT_PAD_ROUND,
-	FT_PAD_CEIL, FT_PIX_FLOOR, FT_PIX_ROUND, FT_PIX_CEIL): New macros.
+	FT_PAD_CEIL, FT_PIX_FLOOR, FT_PIX_ROUND, FT_CEIL): New macros.  They
-	They are used to avoid compiler warnings with very pedantic compilers.
+	are used to avoid compiler warnings with very pedantic compilers.
 	Note that `(x) & -64' causes a warning if (x) is not signed.  Use
 	`(x) & ~63' instead!
 	Updated all related code.
@ -4231,7 +4231,7 @@
 	(t42_parse_encoding): Use `ft_isdigit'.
-	* src/base/ftmm.c (ft_face_get_mm_service): Return FT_Err_Ok if
+	* src/base/ftmm.c (ft_face_get_mm_service): Return FT_Err_OK if
 	success.
 2003-10-05  Werner Lemberg  <wl@gnu.org>
@ -4355,7 +4355,7 @@
 	new POSTSCRIPT_NAMES service.
 	* src/psaux/t1decode.h (t1_lookup_glyph_by_stdcharcode,
 	t1_decode_init): Use new POSTSCRIPT_NAMES service.
-	* src/psaux/t1cmap.h, src/psaux/t1decode.h: Don't include
+	* src/psaux/t1cmap.h, src/psaux/t1decode.h: Dont' include
 	FT_INTERNAL_POSTSCRIPT_NAMES_H.
 	* src/psnames/psmodule.c:  Don't include
@ -4749,7 +4749,8 @@
 	* include/freetype/ttunpat.h: Fixing documentation comment.
 	* include/freetype/config/ftoption.h, devel/ftoption.h
-	(TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING): Replaced with...
+	(TT_CONFIG_OPTION_OPTION_COMPILE_UNPATENTED_HINTING): Replaced
 	with...
 	(TT_CONFIG_OPTION_UNPATENTED_HINTING): This.  Updated all users.
 	(TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING): Removed.
@ -5023,7 +5024,7 @@
 	drivers.
 	* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
-	(FT_Set_Pixel_Sizes): Assign value to `metrics' after validation of
+	(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
 	arguments.
 2003-06-20  Werner Lemberg  <wl@gnu.org>
@ -5199,7 +5200,7 @@
 	* src/cid/cidload.c (cid_load_keyword): Handle
 	T1_FIELD_LOCATION_BBOX.
 	(parse_font_bbox): Commented out.
-	(cid_field_records): Comment out element for parsing FontBBox.
+	(cid_field_record): Comment out element for parsing FontBBox.
 	* src/type42/t42parse.c (t42_parse_font_bbox): Commented out.
 	(t42_keywords): Handle FontBBox with T1_FIELD_BBOX, not with
@ -5915,7 +5916,7 @@
 2003-04-23  Werner Lemberg  <wl@gnu.org>
 	* src/pfr/pfrload.c (pfr_extra_item_load_font_id): Use FT_PtrDist
-	instead of FT_UInt for `len'.
+	instead of FT_Uint for `len'.
 2003-04-22  Werner Lemberg  <wl@gnu.org>
@ -6549,7 +6550,7 @@
 	* src/cache/ftcsbits.c (ftc_sbit_node_load): Fixed a small bug that
 	caused problems with embedded bitmaps.
-	* src/otlayout/otlayout.h, src/otlayout/otlconf.h,
+	* src/otlayout/otlayout.h, src/otlyaout/otlconf.h,
 	src/otlayout/otlgsub.c, src/otlayout/otlgsub.h,
 	src/otlayout/otlparse.c, src/otlayout/otlparse.h,
 	src/otlayout/otlutils.h: Updating the OpenType Layout code, adding
@ -7238,7 +7239,7 @@
 	(ft_smooth_render, ft_smooth_render_lcd, ft_smooth_render_lcd_v):
 	New functions.
-	(ft_smooth_lcd_renderer_class, ft_smooth_lcdv_renderer_class): New
+	(ft_smooth_locd_renderer_class, ft_smooth_lcdv_renderer_class): New
 	classes.
 	* src/truetype/ttobjs.c (TT_{Done,New}_GlyphZone): Renamed to...
@ -7375,7 +7376,7 @@
 	* src/pcf/pcfdriver.c (PCF_Glyph_Load): Fix computation of
 	horiBearingX.
-	* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Fix computation of
+	* src/bdf/bdfdrivr.c (BDF_GlyphLoad): Fix computation of
 	horiBearingY.
 2002-08-16  George Williams  <gww@silcom.com>
@ -7580,7 +7581,7 @@
 	* include/freetype/cache/ftccache.h, src/cache/ftccache.i,
 	src/cache/ftccache.c [!FTC_CACHE_USE_LINEAR_HASHING]: Removed.
-	(FTC_CACHE_USE_LINEAR_HASHING): Removed also.
+	(FTC_CACHE_USE_LINEAR_HASHING: Removed also.
 	FT_CONFIG_OPTION_USE_CMAPS is now the default.
@ -7602,7 +7603,7 @@
 	* src/cid/cidriver.c (Cid_Get_Char_Index, Cid_Get_Next_Char):
 	Removed.
-	(t1cid_driver_class): Updated.
+	(t1_cid_driver_class): Updated.
 	* src/truetype/ttdriver.c (tt_driver_class): Updated.
 	* src/type1/t1driver.c (Get_Char_Index, Get_Next_Char): Removed
 	(t1_driver_class): Updated.
@ -7697,7 +7698,7 @@
 	  CFF_Done_SubFont -> cff_subfont_done
 	  CFF_Load_Font -> cff_font_load
 	  CFF_Done_Font -> cff_font_done
-	  CFF_Size_Get_Globals_Funcs -> cff_size_get_globals_funcs
+	  CFF_Size_Get_Global_Funcs -> cff_size_get_global_funcs
 	  CFF_Size_Done -> cff_size_done
 	  CFF_Size_Init -> cff_size_init
 	  CFF_Size_Reset -> cff_size_reset
@ -8635,7 +8636,7 @@
 	src/pfr/*: New files.
 	* include/freetype/config/ftmodule.h,
-	include/freetype/internal/fttrace.h, src/Jamfile: Updated.
+	include/freetype/internal/fttrace.h, src/Jamefile: Updated.
 	* src/type1/t1gload.h (T1_Load_Glyph), src/type1/t1gload.c
 	(T1_Load_Glyph): Fixed incorrect parameter sign-ness in callback
@ -9062,7 +9063,7 @@
 	  FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
 	  FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
-	* src/base/ftapi.c: New file.  It contains backward compatibility
+	* src/base/ftapi.c: New file.  It contains backwards compatibility
 	functions.
 	* include/freetype/internal/psaux.h, src/cid/cidload.c,
@ -9105,7 +9106,7 @@
 	FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
 	* src/base/ftcalc.c (FT_MulFix): Ditto.
 	* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
-	* src/cff/cffobjs.c (CFF_Size_Get_Globals_Funcs, CFF_Size_Init,
+	* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
 	CFF_GlyphSlot_Init): Ditto.
 	* src/cid/cidobjs.c (CID_GlyphSlot_Init,
 	CID_Size_Get_Globals_Funcs): Ditto.
@ -9246,7 +9247,7 @@
 	  {
 	  } PS_StructRec, *PS_Struct;
-	  typedef PS_StructRec  T1_Struct;  /* backward compatibility */
+	  typedef PS_StructRec  T1_Struct;  /* backwards-compatibility */
 	Hence, we increase the coherency of the source code by effectively
 	using the `Rec' prefix for structure types.
@ -9383,7 +9384,7 @@
 	* src/pcf/pcfread.c (pcf_seek_to_table_type): Ditto.
 	* src/sfnt/sfdriver.c (get_sfnt_postscript_name): Ditto.
 	(pcf_get_bitmaps): The same for `sizebitmaps'.
-	* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): The same for
+	* src/psaux/t1decode.c (T1_Decode_Parse_Charstrings): The same for
 	`orig_y'.
 	(t1operator_seac): Comment out more dead code.
 	* src/pshinter/pshalgo2.c (ps2_hints_apply): Add `DEBUG_HINTER'
@ -9422,7 +9423,7 @@
 ----------------------------------------------------------------------------
-Copyright 2002-2017 by
+Copyright 2002-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.22
+++ b/modules/freetype2/ChangeLog.22
@ -189,7 +189,7 @@
 	* src/base/ftdbgmem.c (_ft_debug_file, _ft_debug_lineno)
 	[FT_DEBUG_MEMORY]: New global variables, replacing...
-	(FT_MemTableRec) [FT_DEBUG_MEMORY]: Remove `filename' and
+	(FT_MemTable_Rec) [FT_DEBUG_MEMORY]: Remove `filename' and
 	`line_no'.  Update all callers.
 	(ft_mem_debug_alloc) [FT_DEBUG_MEMORY]: Avoid possible integer
 	overflow.
@ -494,7 +494,7 @@
 	FTC_MruList_Init, FTC_MruList_Reset, FTC_MruList_Done,
 	FTC_MruList_New, FTC_MruList_Remove, FTC_MruList_RemoveSelection):
 	Declare as FT_LOCAL_DEF.
-	(FTC_MruList_Find, FTC_MruList_Lookup) [!FTC_INLINE]: Compile
+	(FTC_MruListFind, FTC_MruList_Lookup) [!FTC_INLINE]: Compile
 	conditionally.
 	Declare as FT_LOCAL_DEF.
@ -605,7 +605,7 @@
 	* docs/release: Minor additions and clarifications.
-	* docs/CHANGES: Updated to reflect many fixes for backward
+	* docs/CHANGES: Updated to reflect many fixes for backwards
 	compatibility.  Still incomplete.
 2006-02-26  David Turner  <david@freetype.org>
@ -814,7 +814,7 @@
 	* include/freetype/ftcache.h (FTC_IMAGE_TYPE_COMPARE,
 	FTC_IMAGE_TYPE_HASH), src/cache/ftcbasic.c (FTC_OldFontRec,
 	FTC_OldImageDescRec, FTC_ImageCache_Lookup, FTC_Image_Cache_New,
-	FTC_OldImageDesc, FTC_OLD_IMAGE_FORMAT, ftc_old_image_xxx,
+	FTC_OldImage_Desc, FTC_OLD_IMAGE_FORMAT, ftc_old_image_xxx,
 	ftc_image_type_from_old_desc, FTC_Image_Cache_Lookup,
 	FTC_SBitCache_Lookup, FTC_SBit_Cache_New, FTC_SBit_Cache_Lookup)
 	[FT_CONFIG_OPTION_OLD_INTERNALS]: Try to revive old functions of the
@ -2458,8 +2458,8 @@
 	* src/gxvalid/gxvbsln.c (GXV_BSLN_VALUE_EMPTY): Add `U'.
-	* src/gxvalid/gxvmort1.c (GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE),
+	* src/gxvalid/gxmort1.c (GXV_MORT_SUBTABLE_TYPE1_HEADER_SIZE),
-	src/gxvalid/gxvmort2.c (GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE): Fix
+	src/gxvalid/gxmort2.c (GXV_MORT_SUBTABLE_TYPE2_HEADER_SIZE): Fix
 	typo.
 	* src/gxvalid/gxvmorx0.c, src/gxvalid/gxvmorx1.c,
@ -2787,7 +2787,7 @@
 2005-06-15  Kirill Smelkov  <kirr@mns.spb.ru>
 	The next release will be 2.2.0, so don't worry about source code
-	backward compatibility.
+	backwards compatibility.
 	* include/freetype/ftimage.h (FT_Outline_MoveToFunc,
 	FT_Outline_LineToFunc, FT_Outline_ConicToFunc,
@ -2821,7 +2821,7 @@
 ----------------------------------------------------------------------------
-Copyright 2005-2017 by
+Copyright 2005-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.23
+++ b/modules/freetype2/ChangeLog.23
@ -607,7 +607,7 @@
 	(ft_black_render): Initialize `worker->gray_lines' (problem found by
 	valgrind).
-	(FT_RASTER_OPTION_ANTI_ALIASING, DEBUG_RASTER): Don't #undef, just
+	(FT_RASTER_OPTION_ANTI_ALIASING, DEBUG_RASTER): Dont' #undef, just
 	comment out.
 2009-09-12  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@ -671,7 +671,7 @@
 	* src/raster/rules.mk: Don't handle ftmisc.h.  It is needed for
 	stand-alone mode only.
-	* src/raster/ftmisc.h (FT_MemoryRec, FT_Alloc_Func, FT_Free_Func,
+	* src/raster/ftmisc.h (FT_MemoryRec , FT_Alloc_Func, FT_Free_Func,
 	FT_Realloc_Func): Copy declarations from ftsystem.h.
 2009-09-02  Bram Tassyns  <bramt@enfocus.be>
@ -929,7 +929,7 @@
 	type1: Fix a data type mismatching with its source.
 	* include/freetype/internal/t1types.h: The type of
-	T1_Face->buildchar is matched with T1_Decoder->top.
+	T1_Face->buildchar is matched with T1_Decorder->top.
 2009-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@ -944,7 +944,7 @@
 	pfr: Fix a data type mismatching with its source.
-	* src/pfr/pfrtypes.h: The type of PFR_PhyFont->chars_offset
+	* src/pfr/pfrtypes.h: The type of PFR_PhysFont->chars_offset
 	is extended from FT_UInt32 to FT_Offset, because it is
 	calculated with the pointer difference in pfr_phy_font_load().
@ -975,8 +975,8 @@
 	psaux: Fix a data type mismatching with its source.
 	* include/freetype/internal/psaux.h: The type of
-	T1_DecoderRec.buildchar is matched with
+	T1_DecorderRec.buildchar is matched with
-	T1_DecoderRec.top.
+	T1_DecorderRec.top.
 2009-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@ -2125,7 +2125,7 @@
 	code unconditionally.
 	Add support for random numbers and update remaining code
 	accordingly; this should work now.
-	(t1operator_seac): Updated.
+	(t1_operator_seac): Updated.
 	* src/psaux/pshrec.c: Include FT_INTERNAL_CALC_H.
 	(ps_hints_t1stem3, t1_hints_stem): Updated.
@ -2594,14 +2594,14 @@
 	Position Independent Code (PIC) support in smooth renderer.
 	* src/smooth/ftsmooth.h declare ft_smooth_renderer_class,
-	ft_smooth_lcd_renderer_class and ft_smooth_lcdv_renderer_class
+	ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class
 	using macros from ftrender.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
 	* src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined
 	the following structs:
 	ft_smooth_renderer_class, ft_smooth_lcd_renderer_class
-	and ft_smooth_lcdv_renderer_class
+	and ft_smooth_lcd_v_renderer_class
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from ftspic.h in order to access
@ -4156,7 +4156,7 @@
 2008-09-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 	* builds/unix/configure.raw: Clear FT2_EXTRA_LIBS when Carbon or
-	ApplicationServices framework is missing.  Although this value is not
+	ApplicationService framework is missing.  Although this value is not
 	used in building of FreeType2, it is written in `freetype2.pc' and
 	`freetype-config'.
@ -4861,7 +4861,7 @@
 2008-04-14  Werner Lemberg  <wl@gnu.org>
 	* src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to
-	`FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZW'.  From Savannah
+	`FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'.  From Savannah
 	bug #22909.
 2008-04-13  Werner Lemberg  <wl@gnu.org>
@ -5243,7 +5243,7 @@
 	functions related to cmap type 14 support to the
 	`FT_Object_ActionName' scheme:
-	  FT_Get_Char_Variant_Index     -> FT_Face_GetCharVariantIndex
+	  FT_Get_Char_Variant_index     -> FT_Face_GetCharVariantIndex
 	  FT_Get_Char_Variant_IsDefault -> FT_Face_GetCharVariantIsDefault
 	  FT_Get_Variant_Selectors      -> FT_Face_GetVariantSelectors
 	  FT_Get_Variants_Of_Char       -> FT_Face_GetVariantsOfChar
@ -5383,7 +5383,7 @@
 	* include/freetype/ftotval.h (FT_VALIDATE_MATH): New macro.
 	(FT_VALIDATE_OT): Updated.
-	* src/otvalid/otvmath.c: New file.
+	* src/otvalid/otmath.c: New file.
 	* src/otvalid/otvalid.c: Include otvmath.c.
 	* src/otvalid/otvmod.c (otv_validate): Handle `MATH' table.
@ -5530,7 +5530,7 @@
 	* src/truetype/ttinterp.c (Ins_IUP): Add missing variable
 	initialization.
-	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Get rid of an
+	* src/autofit/aflatin.c (af_latin_metric_init_blues): Get rid of an
 	infinite loop in the case of degenerate fonts.
 2007-06-26  Rahul Bhalerao  <b.rahul.pm@gmail.com>
@ -5965,7 +5965,7 @@
 	* include/freetype/config/ftstdlib.h,
 	include/freetype/internal/ftobjs.h: As suggested by Graham Asher,
 	ensure that ft_isalnum, ft_isdigit, etc., use hard-coded values
-	instead of relying on the locale-dependent functions provided by
+	instead on relying on the locale-dependent functions provided by
 	<ctypes.h>.
 2007-05-15  Graham Asher  <graham.asher@btinternet.com>
@ -7023,7 +7023,7 @@
 	(_ft_lcd_filter_fir): This.
 	Update parameters.
 	(_ft_lcd_filter_legacy) [USE_LEGACY]: New filter function.
-	(FT_Library_SetLcdFilter): Update parameters.
+	(FT_Library_Set_LcdFilter): Update parameters.
 	Handle new filter modes.
 	* include/internal/ftobjs.h: Include FT_LCD_FILTER_H.
@ -7366,7 +7366,7 @@
 	to recognize a few fonts that require the automatic unpatented
 	loader.
-	* src/smooth/ftgrays.c: Optimize the performance of the anti-aliased
+	* src/smooth/ftgrays.c: Optmize the performance of the anti-aliased
 	rasterizer.  The speed improvement is between 15% and 25%, depending
 	on the font data.
@ -7857,7 +7857,7 @@
 2006-05-18  Werner Lemberg  <wl@gnu.org>
 	* src/truetype/ttgload.c (TT_Load_Composite_Glyph)
-	[TT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Make it compilable again.
+	[FT_CONFIG_OPTION_BYTECODE_INTERPRETER]: Make it compilable again.
 2006-05-17  David Turner  <david@freetype.org>
@ -7932,7 +7932,7 @@
 ----------------------------------------------------------------------------
-Copyright 2006-2017 by
+Copyright 2006-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.24
+++ b/modules/freetype2/ChangeLog.24
@ -335,7 +335,7 @@
 	* include/freetype/ftmoderr.h: Fix commit from 2013-03-11.
-	The previous version was not backward compatible.  Reported by
+	The previous version was not backwards compatible.  Reported by
 	Behdad.
 2013-03-14  Werner Lemberg  <wl@gnu.org>
@ -784,7 +784,7 @@
 	and `const' where appropriate.
 	(X_SCALING_Rules, X_SCALING_RULES_SIZE): Renamed to...
-	(sph_X_SCALING_Rules, SPH_X_SCALING_RULES_SIZE): This.
+	(spu_X_SCALING_Rules, SPH_X_SCALING_RULES_SIZE): This.
 	Update all users.
 2013-01-12  Alexei Podtelezhnikov  <apodtele@gmail.com>
@ -2141,7 +2141,7 @@
 	* include/freetype/ftoutln.h (FT_Outline_EmboldenXY): Define it.
 	* src/base/ftoutln.c (FT_Outline_EmboldenXY): Implement it, using a
-	simplified emboldening algorithm.
+	simplified embolding algorithm.
 	(FT_Outline_Embolden): Make it a special case of
 	`FT_Outline_EmboldenXY'
@ -2941,10 +2941,10 @@
 	[type42] Remove casts.
-	* src/type42/t42drivr.c (t42_driver_class): Remove all casts and
+	* src/type42/t42driver.c (t42_driver_class): Remove all casts and
 	update affected functions.
-	* src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42 driver
+	* src/type42/t42objs.c, src/type42/t42objs.h: Updated for t42driver
 	changes.
 2011-11-30  Werner Lemberg  <wl@gnu.org>
@ -3776,7 +3776,7 @@
 	[gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c.
 	* src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate):
-	Check different entries pointing same tracking value.
+	Check different entries pointing same traking value.
 	(gxv_trak_validate): Remove unused variable `table_size'.
 2011-06-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@ -3788,12 +3788,12 @@
 	(gxv_morx_chain_validate): Conditionalize unvalidated
 	variable `defaultFlags'.
-	* src/gxvalid/gxvmorx0.c
+	* src/gxvalid/gxmorx0.c
 	(gxv_morx_subtable_type0_entry_validate):
 	Conditionalize unvalidated variables; `markFirst',
 	`dontAdvance', `markLast', `verb'.
-	* src/gxvalid/gxvmorx1.c
+	* src/gxvalid/gxmorx1.c
 	(gxv_morx_subtable_type1_entry_validate): Conditionalize
 	unvalidated variables; `setMark', `dontAdvance'.
@ -3826,11 +3826,11 @@
 	(gxv_mort_chain_validate): Conditionalize unvalidated
 	variable `defaultFlags'.
-	* src/gxvalid/gxvmort0.c
+	* src/gxvalid/gxmort0.c
 	(gxv_mort_subtable_type0_entry_validate): Check the
 	conflict of the marks for the glyphs.
-	* src/gxvalid/gxvmort1.c
+	* src/gxvalid/gxmort1.c
 	(gxv_mort_subtable_type1_offset_to_subst_validate):
 	Local variables `min_gid', `max_gid' are replaced by
 	variables in the validator.
@ -4029,7 +4029,7 @@
 	af_latin_hints_compute_blue_edges.
 	(af_cjk_metrics_init_blues): New function, CJK version of
 	af_latin_metrics_init_blues.
-	(af_cjk_hint_edges): Add code to align the edge stems to blue zones.
+	(af_cjk_hints_edges): Add code to align the edge stems to blue zones.
 	* src/autofit/afindic.c (af_indic_metrics_init): Take AF_CJKMetric
 	instead of AF_LatinMetric, and initialize as af_cjk_metrics_init.
@ -5669,7 +5669,7 @@
 	Use defined macros to set {platform,encoding}_id.
 	* src/bdf/bdfdrivr.c: Include ttnameid.h and use macros to
-	set charmap.{platform,encoding}_id.
+	set charmap.{platfom,encoding}_id.
 	* src/pcf/pcfdrivr.c: Ditto.
 	* src/winfonts/winfnt.c: Ditto.
 	* src/type1/t1objs.c: Ditto.
@ -5792,8 +5792,8 @@
 	* src/cff/cffobjs.c (cff_face_init): Check error value by
 	`FT_CMap_New'.
 	* src/pfr/pfrobjs.c (pfr_face_init): Ditto.
-	* src/type1/t1objs.c (T1_Face_Init): Ditto.
+	* src/type1/t1jobjs.c (T1_Face_Init): Ditto.
-	* src/type42/t42objs.c (T42_Face_Init): Ditto.
+	* src/type42/t42jobjs.c (T42_Face_Init): Ditto.
 2010-07-03  Werner Lemberg  <wl@gnu.org>
@ -6344,7 +6344,7 @@
 ----------------------------------------------------------------------------
-Copyright 2010-2017 by
+Copyright 2010-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.25
+++ b/modules/freetype2/ChangeLog.25
@ -244,7 +244,7 @@
 	All public FreeType enumeration and flag values are uppercase...
-	* include/tttables.h (FT_Sfnt_Tag): Implement it.  For backward
+	* include/tttables.h (FT_Sfnt_Tag): Implement it.  For backwards
 	compatibility, retain the old values as macros.
 	* src/base/ftfstype.c (FT_Get_FSType_Flags), src/sfnt/sfdriver.c
@ -1223,7 +1223,7 @@
 2014-10-14  Werner Lemberg  <wl@gnu.org>
-	[autofit] Adjust Devanagari character range.
+	[autofit] Adjust Devenagari character range.
 	* src/autofit/afranges.c (af_deva_uniranges): Omit characters that
 	are common to all other Indic scripts.
@ -4767,7 +4767,7 @@
 	* src/cache/ftcmanag.c (FTC_Manager_Check): Fix cast.
 	* src/cache/ftcmanag.h (FTC_ManagerRec): Ditto.
-	* src/cff/cf2arrst.c (cf2_arrstack_setNumElements): Use cast.
+	* src/cff/cf2arrst.c (cf2_arrstack_setNum_Elements): Use cast.
 	* src/cff/cf2ft.c (cf2_freeSeacComponent): Ditto.
 	* src/cff/cffobjs.c (remove_subset_prefix, remove_style): Ditto.
@ -5145,7 +5145,7 @@
 ----------------------------------------------------------------------------
-Copyright 2013-2017 by
+Copyright 2013-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/ChangeLog.26
+++ b/modules/freetype2/ChangeLog.26
@ -324,7 +324,7 @@
 2016-06-20  Alexei Podtelezhnikov  <apodtele@gmail.com>
-	[smooth] Sanitize memory management.
+	[smooth] Sanitize memory managenent.
 	* src/smooth/ftgrays.c (gray_convert_glyph): Cleaned up.
@ -434,7 +434,7 @@
 	* src/truetype/ttinterp.c (Ins_SHPIX): Allow SHPIX to move points in
 	the twilight zone.  Otherwise, treat SHPIX the same as DELTAP.
 	Unbreaks various fonts such as older versions of Rokkitt and DTL
-	Argo T Light that would glitch severely after calling ALIGNRP after a
+	Argo T Light that would glitch severly after calling ALIGNRP after a
 	blocked SHPIX.
 2016-05-30  Werner Lemberg  <wl@gnu.org>
@ -460,7 +460,7 @@
 	[smooth] Shrink bisection stack.
 	The convergence of Bézier flatteners is fast with the deviation
-	from straight line being asymptotically cut 4-fold on each bisection.
+	from straight line being assymptotically cut 4-fold on each bisection.
 	This justifies smaller bisection stack size.
 	* src/smooth/ftgrays.c (gray_TWorker): Remove common `bez_stack'.
@ -563,26 +563,26 @@
 	* src/truetype/ttinterp.c (SUBPIXEL_HINTING): Replaced by...
 	(NO_SUBPIXEL_HINTING, SUBPIXEL_HINTING_INFINALITY,
 	SUBPIXEL_HINTING_MINIMAL): ...new macros.
-	(Direct_Move, Direct_Move_X, Direct_Move_Y): Handle backward
+	(Direct_Move, Direct_Move_X, Direct_Move_Y): Handle backwards
 	compatibility.
 	Updated.
 	(Ins_RS, Ins_FDEF, Ins_ENDF, Ins_CALL, Ins_LOOPCALL, Ins_MD):
 	Updated.
 	(Ins_INSTCTRL): Handle native ClearType mode flag.
 	Updated.
-	(Ins_FLIPPT, Ins_FLIPRGON, Ins_FLIPRGOFF): Handle backward
+	(Ins_FLIPPT, Ins_FLIPRGON, Ins_FLIPRGOFF): Handle backwards
 	compatibility.
 	(Move_Zp2_Point): Ditto.
 	(Ins_SHP): Updated.
-	(Ins_SHPIX): Handle backward compatibility.
+	(Ins_SHPIX): Handle backwards compatibility.
 	Updated.
 	(Ins_MSIRP, Ins_MDAP, Ins_MIAP, Ins_MDRP, Ins_MIRP): Updated.
 	(Ins_ALIGNRP): Updated.
-	(Ins_IUP, Ins_DELTAP): Handle backward compatibility.
+	(Ins_IUP, Ins_DELTAP): Handle backwards compatibility.
 	Updated.
 	(Ins_GETINFO): Handle v38 flags.
 	Updated.
-	(TT_RunIns): Handle backward compatibility mode.
+	(TT_RunIns): Handle backwards compatibility mode.
 	Updated.
 2016-05-17  Nikolaus Waxweiler  <madigens@gmail.com>
@ -606,16 +606,16 @@
 	* src/truetype/ttinterp.h (TT_ExecContextRec): Define new fields
 	`subpixel_hinting_lean', `vertical_lcd_lean',
-	`backward_compatibility', `iupx_called', iupy_called', and
+	`backwards_compatibility', `iupx_called', iupy_called', and
 	`grayscale_cleartype' for new hinting mode.
 	* src/truetype/ttdriver.c (tt_property_set): Handle v38 and v40
 	interpreters conditionally.
 	* src/truetype/ttgload.c (TT_Hint_Glyph): Save phantom points unless
-	in v38 backward compatibility mode.
+	in v38 backwards compatibility mode.
 	Updated.
-	(compute_glyph_metrics): Add v38 backward compatibility mode
+	(compute_glyph_metrics): Add v38 backwards compatibility mode
 	constraint for adjusting advance widths.
 	Updated.
 	(tt_loader_init): Handle new flags `subpixel_hinting_lean',
@ -979,7 +979,7 @@
 	* src/smooth/ftgrays.c (gray_render_conic, gray_render_cubic): Move
 	band clipping from here.
 	(gray_conic_to, gray_cubic_to): ... to here.
-	(gray_render_line, gray_render_scanline): Initialize variables closer
+	(gray_rander_line, gray_render_scanline): Initialize variables closer
 	to their use.
 2016-03-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
@ -1482,7 +1482,7 @@
 	Still handle `__FTERRORS_H__'.
-	We need this for backward compatibility.
+	We need this for backwards compatibility.
 	Problem reported by John Emmas <johne53@tiscali.co.uk>.
@ -3408,7 +3408,7 @@
 	[raster,smooth] Microoptimizations.
 	* src/raster/ftraster.c (Insert_Y_Turn, Finalize_Profile_Table,
-	Bezier_Up): Use do-while loops.
+	Bezier_Up, ): Use do-while loops.
 	* src/smooth/ftgrays.c (gray_render_scanline, gray_render_line,
 	gray_convert_glyph): Ditto.
@ -4222,7 +4222,7 @@
 	[truetype] Support selector index 3 of the INSTCTRL instruction.
-	This flag activates `native ClearType hinting', disabling backward
+	This flag activates `native ClearType hinting', disabling backwards
 	compatibility mode as described in Greg Hitchcocks whitepaper.  In
 	other words, it enables unrestricted functionality of all TrueType
 	instructions in ClearType.
@ -5447,7 +5447,7 @@
 	[raster] Remove 5-level gray AA mode from monochrome rasterizer.
 	It was off by default and couldn't be turned on at runtime.  And the
-	smooth rasterizer superseded it over ten years ago.  No point in
+	smooth rasterizer superceded it over ten years ago.  No point in
 	keeping.  Comments suggested that it was there for compatibility
 	with FreeType 1.
@ -5695,7 +5695,7 @@
 ----------------------------------------------------------------------------
-Copyright 2015-2017 by
+Copyright 2015-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/Jamfile
+++ b/modules/freetype2/Jamfile
@ -1,6 +1,6 @@
 # FreeType 2 top Jamfile.
 #
-# Copyright 2001-2017 by
+# Copyright 2001-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -210,7 +210,7 @@ actions RefDoc
 {
  python $(FT2_SRC)/tools/docmaker/docmaker.py
         --prefix=ft2
-         --title=FreeType-2.8
+         --title=FreeType-2.7.1
         --output=$(DOC_DIR)
         $(FT2_INCLUDE)/freetype/*.h
         $(FT2_INCLUDE)/freetype/config/*.h
--- a/modules/freetype2/Jamrules
+++ b/modules/freetype2/Jamrules
@ -1,6 +1,6 @@
 # FreeType 2 JamRules.
 #
-# Copyright 2001-2017 by
+# Copyright 2001-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/Makefile
+++ b/modules/freetype2/Makefile
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/README
+++ b/modules/freetype2/README
@ -1,5 +1,5 @@
-  FreeType 2.8
+  FreeType 2.7.1
-  ============
+  ==============
  Homepage: http://www.freetype.org
@ -24,9 +24,9 @@
  and download one of the following files.
-    freetype-doc-2.8.tar.bz2
+    freetype-doc-2.7.1.tar.bz2
-    freetype-doc-2.8.tar.gz
+    freetype-doc-2.7.1.tar.gz
-    ftdoc28.zip
+    ftdoc271.zip
  To view the documentation online, go to
@ -71,7 +71,7 @@
 ----------------------------------------------------------------------
-Copyright 2006-2017 by
+Copyright 2006-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/README.git
+++ b/modules/freetype2/README.git
@ -37,7 +37,7 @@ repository.
 ----------------------------------------------------------------------
-Copyright 2005-2017 by
+Copyright 2005-2016 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/README.moz-patches
+++ b/modules/freetype2/README.moz-patches
@ -1,5 +1,5 @@
-This directory contains freetype2 v2.8 downloaded from
+This directory contains freetype2 v2.7 downloaded from
-https://download.savannah.gnu.org/releases/freetype/
+http://savannah.nongnu.org/download/freetype/
 There are currently no local changes applied to the freetype tree,
 except that the file docs/LICENSE.TXT has been copied to the top-level
--- a/modules/freetype2/autogen.sh
+++ b/modules/freetype2/autogen.sh
@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright 2005-2017 by
+# Copyright 2005-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/amiga/README
+++ b/modules/freetype2/builds/amiga/README
@ -1,7 +1,7 @@
 README for the builds/amiga subdirectory.
-Copyright 2005-2017 by
+Copyright 2005-2016 by
 Werner Lemberg and Detlef Würkner.
 This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/amiga/include/config/ftconfig.h
+++ b/modules/freetype2/builds/amiga/include/config/ftconfig.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright 2005-2017 by                                                 */
+/*  Copyright 2005-2016 by                                                 */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/amiga/include/config/ftmodule.h
+++ b/modules/freetype2/builds/amiga/include/config/ftmodule.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright 2005-2017 by                                                 */
+/*  Copyright 2005-2016 by                                                 */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/amiga/makefile
+++ b/modules/freetype2/builds/amiga/makefile
@ -5,7 +5,7 @@
 #
-# Copyright 2005-2017 by
+# Copyright 2005-2016 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/amiga/makefile.os4
+++ b/modules/freetype2/builds/amiga/makefile.os4
@ -4,7 +4,7 @@
 #
-# Copyright 2005-2017 by
+# Copyright 2005-2016 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/amiga/smakefile
+++ b/modules/freetype2/builds/amiga/smakefile
@ -3,7 +3,7 @@
 #
-# Copyright 2005-2017 by
+# Copyright 2005-2016 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/amiga/src/base/ftdebug.c
+++ b/modules/freetype2/builds/amiga/src/base/ftdebug.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for amiga (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2017 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/amiga/src/base/ftsystem.c
+++ b/modules/freetype2/builds/amiga/src/base/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright 1996-2017 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/ansi/ansi-def.mk
+++ b/modules/freetype2/builds/ansi/ansi-def.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/ansi/ansi.mk
+++ b/modules/freetype2/builds/ansi/ansi.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/beos/beos-def.mk
+++ b/modules/freetype2/builds/beos/beos-def.mk
@ -5,7 +5,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/beos/beos.mk
+++ b/modules/freetype2/builds/beos/beos.mk
@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/beos/detect.mk
+++ b/modules/freetype2/builds/beos/detect.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/cmake/iOS.cmake
+++ b/modules/freetype2/builds/cmake/iOS.cmake
@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright 2014-2017 by
+# Copyright 2014-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <david@wimsey.us>
--- a/modules/freetype2/builds/cmake/testbuild.sh
+++ b/modules/freetype2/builds/cmake/testbuild.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e
-# Copyright 2015-2017 by
+# Copyright 2015-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/ansi-cc.mk
+++ b/modules/freetype2/builds/compiler/ansi-cc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/bcc-dev.mk
+++ b/modules/freetype2/builds/compiler/bcc-dev.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/bcc.mk
+++ b/modules/freetype2/builds/compiler/bcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/emx.mk
+++ b/modules/freetype2/builds/compiler/emx.mk
@ -3,7 +3,7 @@
 #
-# Copyright 2003-2017 by
+# Copyright 2003-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/gcc-dev.mk
+++ b/modules/freetype2/builds/compiler/gcc-dev.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/gcc.mk
+++ b/modules/freetype2/builds/compiler/gcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/intelc.mk
+++ b/modules/freetype2/builds/compiler/intelc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/unix-lcc.mk
+++ b/modules/freetype2/builds/compiler/unix-lcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/visualage.mk
+++ b/modules/freetype2/builds/compiler/visualage.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/visualc.mk
+++ b/modules/freetype2/builds/compiler/visualc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/watcom.mk
+++ b/modules/freetype2/builds/compiler/watcom.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/compiler/win-lcc.mk
+++ b/modules/freetype2/builds/compiler/win-lcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/detect.mk
+++ b/modules/freetype2/builds/detect.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/dos/detect.mk
+++ b/modules/freetype2/builds/dos/detect.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/dos/dos-def.mk
+++ b/modules/freetype2/builds/dos/dos-def.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/dos/dos-emx.mk
+++ b/modules/freetype2/builds/dos/dos-emx.mk
@ -3,7 +3,7 @@
 #
-# Copyright 2003-2017 by
+# Copyright 2003-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/dos/dos-gcc.mk
+++ b/modules/freetype2/builds/dos/dos-gcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/dos/dos-wat.mk
+++ b/modules/freetype2/builds/dos/dos-wat.mk
@ -3,7 +3,7 @@
 #
-# Copyright 2003-2017 by
+# Copyright 2003-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/exports.mk
+++ b/modules/freetype2/builds/exports.mk
@ -3,7 +3,7 @@
 #
-# Copyright 2005-2017 by
+# Copyright 2005-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/freetype.mk
+++ b/modules/freetype2/builds/freetype.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/link_dos.mk
+++ b/modules/freetype2/builds/link_dos.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/link_std.mk
+++ b/modules/freetype2/builds/link_std.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/mac/ftmac.c
+++ b/modules/freetype2/builds/mac/ftmac.c
@ -5,7 +5,7 @@
 /*    Mac FOND support.  Written by just@letterror.com.                    */
 /*  Heavily Fixed by mpsuzuki, George Williams and Sean McBride            */
 /*                                                                         */
-/*  Copyright 1996-2017 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/modules.mk
+++ b/modules/freetype2/builds/modules.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/os2/detect.mk
+++ b/modules/freetype2/builds/os2/detect.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/os2/os2-def.mk
+++ b/modules/freetype2/builds/os2/os2-def.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/os2/os2-dev.mk
+++ b/modules/freetype2/builds/os2/os2-dev.mk
@ -5,7 +5,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/os2/os2-gcc.mk
+++ b/modules/freetype2/builds/os2/os2-gcc.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/symbian/bld.inf
+++ b/modules/freetype2/builds/symbian/bld.inf
@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //
-// Copyright 2008-2017 by
+// Copyright 2008-2016 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/symbian/freetype.mmp
+++ b/modules/freetype2/builds/symbian/freetype.mmp
@ -2,7 +2,7 @@
 // FreeType 2 makefile for the symbian platform
 //
-// Copyright 2008-2017 by
+// Copyright 2008-2016 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/toplevel.mk
+++ b/modules/freetype2/builds/toplevel.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/config.guess
+++ b/modules/freetype2/builds/unix/config.guess
@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2017-03-05'
+timestamp='2016-10-02'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -837,11 +837,10 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		UNAME_PROCESSOR=x86_64 ;;
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    i386)
+	    *)
-		UNAME_PROCESSOR=i586 ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@ -1344,9 +1343,6 @@ EOF
    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
    NSX-?:NONSTOP_KERNEL:*:*)
 	echo nsx-tandem-nsk${UNAME_RELEASE}
 	exit ;;
    *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
--- a/modules/freetype2/builds/unix/config.sub
+++ b/modules/freetype2/builds/unix/config.sub
@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2017-04-02'
+timestamp='2016-11-19'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -263,7 +263,7 @@ case $basic_machine in
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
+	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@ -315,7 +315,6 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
 	| wasm32 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@ -389,7 +388,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@ -447,7 +446,6 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
 	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@ -950,9 +948,6 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	nsx-tandem)
 		basic_machine=nsx-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@ -1248,9 +1243,6 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
 	wasm32)
 		basic_machine=wasm32-unknown
 		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
@ -1417,7 +1409,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
--- a/modules/freetype2/builds/unix/configure
+++ b/modules/freetype2/builds/unix/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.8.
+# Generated by GNU Autoconf 2.69 for FreeType 2.7.1.
 #
 # Report bugs to <freetype@nongnu.org>.
 #
@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.8'
+PACKAGE_VERSION='2.7.1'
-PACKAGE_STRING='FreeType 2.8'
+PACKAGE_STRING='FreeType 2.7.1'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''
@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures FreeType 2.8 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.7.1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1394,7 +1394,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.8:";;
+     short | recursive ) echo "Configuration of FreeType 2.7.1:";;
   esac
  cat <<\_ACEOF
@ -1541,7 +1541,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-FreeType configure 2.8
+FreeType configure 2.7.1
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@ -2139,7 +2139,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.8, which was
+It was created by FreeType $as_me 2.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  $ $0 $@
@ -2495,7 +2495,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='19:0:13'
 ft_version=`echo $version_info | tr : .`
@ -15017,7 +15017,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FreeType $as_me 2.8, which was
+This file was extended by FreeType $as_me 2.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -15083,7 +15083,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FreeType config.status 2.8
+FreeType config.status 2.7.1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
--- a/modules/freetype2/builds/unix/configure.ac
+++ b/modules/freetype2/builds/unix/configure.ac
@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2017 by
+# Copyright 2001-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
-AC_INIT([FreeType], [2.8], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.7.1], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='19:0:13'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
--- a/modules/freetype2/builds/unix/configure.raw
+++ b/modules/freetype2/builds/unix/configure.raw
@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001-2017 by
+# Copyright 2001-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 # Don't forget to update `docs/VERSIONS.TXT'!
-version_info='20:0:14'
+version_info='19:0:13'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
--- a/modules/freetype2/builds/unix/detect.mk
+++ b/modules/freetype2/builds/unix/detect.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/freetype-config.in
+++ b/modules/freetype2/builds/unix/freetype-config.in
@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright 2000-2017 by
+# Copyright 2000-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -12,55 +12,11 @@
 LC_ALL=C
 export LC_ALL
-
+prefix="%prefix%"
-# if `pkg-config' is available, use values from `freetype2.pc'
+exec_prefix="%exec_prefix%"
-pkg-config --version >/dev/null 2>&1
+exec_prefix_set="no"
-if test $? -eq 0 ; then
+includedir="%includedir%"
-  # note that option `--variable' is not affected by the
+libdir="%libdir%"
  # PKG_CONFIG_SYSROOT_DIR environment variable
  if test "x$SYSROOT" != "x" ; then
    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
    export PKG_CONFIG_SYSROOT_DIR
  fi
  prefix=`pkg-config --variable prefix freetype2`
  exec_prefix=`pkg-config --variable exec_prefix freetype2`
  includedir=`pkg-config --variable includedir freetype2`
  libdir=`pkg-config --variable libdir freetype2`
  version=`pkg-config --modversion freetype2`
  cflags=`pkg-config --cflags freetype2`
  dynamic_libs=`pkg-config --libs freetype2`
  static_libs=`pkg-config --static --libs freetype2`
 else
  prefix="%prefix%"
  exec_prefix="%exec_prefix%"
  includedir="%includedir%"
  libdir="%libdir%"
  version=%ft_version%
  cflags="-I${SYSROOT}$includedir/freetype2"
  dynamic_libs="-lfreetype"
  static_libs="%LIBSSTATIC_CONFIG%"
  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
    libs_L="-L${SYSROOT}$libdir"
  fi
 fi
 orig_prefix=$prefix
 orig_exec_prefix=$exec_prefix
 orig_includedir=$includedir
 orig_libdir=$libdir
 include_suffix=`echo $includedir | sed "s|$prefix||"`
 lib_suffix=`echo $libdir | sed "s|$exec_prefix||"`
 usage()
 {
@ -83,17 +39,14 @@ Options:
                         library
  --static               make command line options display flags
                         for static linking
  --help                 display this help and exit
 EOF
  exit $1
 }
 if test $# -eq 0 ; then
  usage 1 1>&2
 fi
 while test $# -gt 0 ; do
  case "$1" in
  -*=*)
@ -121,8 +74,8 @@ while test $# -gt 0 ; do
    echo_exec_prefix=yes
    ;;
  --version)
-    echo_version=yes
+    echo %ft_version%
-    break
+    exit 0
    ;;
  --ftversion)
    echo_ft_version=yes
@ -139,9 +92,6 @@ while test $# -gt 0 ; do
  --static)
    show_static=yes
    ;;
  --help)
    usage 0
    ;;
  *)
    usage 1 1>&2
    ;;
@ -149,27 +99,12 @@ while test $# -gt 0 ; do
  shift
 done
 if test "$local_prefix" = "yes" ; then
  if test "$exec_prefix_set" != "yes" ; then
    exec_prefix=$prefix
  fi
 fi
 if test "$local_prefix" = "yes" ; then
  includedir=${prefix}${include_suffix}
  if test "$exec_prefix_set" = "yes" ; then
    libdir=${exec_prefix}${lib_suffix}
  else
    libdir=${prefix}${lib_suffix}
  fi
 fi
 if test "$echo_version" = "yes" ; then
  echo $version
 fi
 if test "$echo_prefix" = "yes" ; then
  echo ${SYSROOT}$prefix
 fi
@ -178,6 +113,15 @@ if test "$echo_exec_prefix" = "yes" ; then
  echo ${SYSROOT}$exec_prefix
 fi
 if test "$exec_prefix_set" = "yes" ; then
  libdir=$exec_prefix/lib
 else
  if test "$local_prefix" = "yes" ; then
    includedir=$prefix/include
    libdir=$prefix/lib
  fi
 fi
 if test "$echo_ft_version" = "yes" ; then
  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
         | grep FREETYPE_MAJOR \
@ -192,20 +136,26 @@ if test "$echo_ft_version" = "yes" ; then
 fi
 if test "$echo_cflags" = "yes" ; then
-  echo $cflags | sed "s|$orig_includedir/freetype2|$includedir/freetype2|"
+  echo -I${SYSROOT}$includedir/freetype2
 fi
 if test "$echo_libs" = "yes" ; then
  libs="-lfreetype"
  staticlibs="%LIBSSTATIC_CONFIG%"
  if test "$show_static" = "yes" ; then
-    libs="$libs_L $static_libs"
+    libs="$staticlibs"
-  else
+  fi
-    libs="$libs_L $dynamic_libs"
+  if test "${SYSROOT}$libdir" != "/usr/lib"  &&
     test "${SYSROOT}$libdir" != "/usr/lib64"; then
    echo -L${SYSROOT}$libdir $libs
  else
    echo $libs
  fi
  echo $libs | sed "s|$orig_libdir|$libdir|"
 fi
 if test "$echo_libtool" = "yes" ; then
-  echo ${SYSROOT}$libdir/libfreetype.la
+  convlib="libfreetype.la"
  echo ${SYSROOT}$libdir/$convlib
 fi
 # EOF
--- a/modules/freetype2/builds/unix/freetype2.m4
+++ b/modules/freetype2/builds/unix/freetype2.m4
@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
 #
-# Copyright 2001-2017 by
+# Copyright 2001-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/ft-munmap.m4
+++ b/modules/freetype2/builds/unix/ft-munmap.m4
@ -1,6 +1,6 @@
 ## FreeType specific autoconf tests
 #
-# Copyright 2002-2017 by
+# Copyright 2002-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/ftconfig.in
+++ b/modules/freetype2/builds/unix/ftconfig.in
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    UNIX-specific configuration file (specification only).               */
 /*                                                                         */
-/*  Copyright 1996-2017 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -365,15 +365,6 @@ FT_BEGIN_HEADER
 #endif
 #ifdef _WIN64
  /* only 64bit Windows uses the LLP64 data model, i.e., */
  /* 32bit integers, 64bit pointers                      */
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned __int64)(x)
 #else
 #define FT_UINT_TO_POINTER( x ) (void*)(unsigned long)(x)
 #endif
  /*************************************************************************/
  /*                                                                       */
  /* miscellaneous                                                         */
--- a/modules/freetype2/builds/unix/ftsystem.c
+++ b/modules/freetype2/builds/unix/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Unix-specific FreeType low-level system interface (body).            */
 /*                                                                         */
-/*  Copyright 1996-2017 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/modules/freetype2/builds/unix/install.mk
+++ b/modules/freetype2/builds/unix/install.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/pkg.m4
+++ b/modules/freetype2/builds/unix/pkg.m4
@ -53,7 +53,7 @@ fi[]dnl
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
 # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurrence in configure.ac, so if the first place
+# only at the first occurence in configure.ac, so if the first place
 # it's called might be skipped (such as if it is within an "if", you
 # have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
--- a/modules/freetype2/builds/unix/unix-cc.in
+++ b/modules/freetype2/builds/unix/unix-cc.in
@ -2,7 +2,7 @@
 # FreeType 2 template for Unix-specific compiler definitions
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -99,7 +99,7 @@ LDFLAGS := @LDFLAGS@
 # export symbols
 #
 CCraw_build  := @CC_BUILD@	# native CC of building system
-E_BUILD      := @EXEEXT_BUILD@	# extension for executable on building system
+E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
 EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
 CCexe        := $(CCraw_build)	# used to compile `apinames' only
--- a/modules/freetype2/builds/unix/unix-def.in
+++ b/modules/freetype2/builds/unix/unix-def.in
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -111,7 +111,7 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
 	    $<                                                 \
 	    > $@.tmp
 	chmod +x $@.tmp
-	chmod go-w $@.tmp
+	chmod a-w $@.tmp
 	mv $@.tmp $@
 # To support directory names with spaces (as might easily happen on Windows
--- a/modules/freetype2/builds/unix/unix-dev.mk
+++ b/modules/freetype2/builds/unix/unix-dev.mk
@ -6,7 +6,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/unix-lcc.mk
+++ b/modules/freetype2/builds/unix/unix-lcc.mk
@ -6,7 +6,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/modules/freetype2/builds/unix/unix.mk
+++ b/modules/freetype2/builds/unix/unix.mk
@ -3,7 +3,7 @@
 #
-# Copyright 1996-2017 by
+# Copyright 1996-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/Показать больше
+++ b/Показать больше