Update FreeType to 2.13.3

Author: QuLogic

.pre-commit-config.yaml

@@ -20,13 +20,13 @@ repos:
       - id: check-docstring-first
         exclude: lib/matplotlib/typing.py  # docstring used for attribute flagged by check
       - id: end-of-file-fixer
-        exclude_types: [svg]
+        exclude_types: [diff, svg]
       - id: mixed-line-ending
       - id: name-tests-test
         args: ["--pytest-test-first"]
       - id: no-commit-to-branch  # Default is master and main.
       - id: trailing-whitespace
-        exclude_types: [svg]
+        exclude_types: [diff, svg]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.15.0
     hooks:

extern/meson.build

@@ -13,11 +13,20 @@ else
   # must match the value in `lib/matplotlib.__init__.py`. Also update the docs
   # in `docs/devel/dependencies.rst`. Bump the cache key in
   # `.circleci/config.yml` when changing requirements.
-  LOCAL_FREETYPE_VERSION = '2.6.1'
+  LOCAL_FREETYPE_VERSION = '2.13.3'
 
   freetype_proj = subproject(
     f'freetype-@LOCAL_FREETYPE_VERSION@',
-    default_options: ['default_library=static'])
+    default_options: [
+      'default_library=static',
+      'brotli=disabled',
+      'bzip2=disabled',
+      'harfbuzz=disabled',
+      'mmap=auto',
+      'png=disabled',
+      'tests=disabled',
+      'zlib=internal',
+  ])
   freetype_dep = freetype_proj.get_variable('freetype_dep')
 endif
 

lib/matplotlib/__init__.py

@@ -1329,7 +1329,7 @@ def _val_or_rc(val, *rc_names):
 def _init_tests():
     # The version of FreeType to install locally for running the tests. This must match
     # the value in `meson.build`.
-    LOCAL_FREETYPE_VERSION = '2.6.1'
+    LOCAL_FREETYPE_VERSION = '2.13.3'
 
     from matplotlib import ft2font
     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or

lib/matplotlib/tests/test_bbox_tight.py

@@ -47,7 +47,7 @@ def test_bbox_inches_tight(text_placeholders):
 
 @image_comparison(['bbox_inches_tight_suptile_legend'],
                   savefig_kwarg={'bbox_inches': 'tight'},
-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
+                  tol=0 if platform.machine() == 'x86_64' else 0.022)
 def test_bbox_inches_tight_suptile_legend():
     plt.plot(np.arange(10), label='a straight line')
     plt.legend(bbox_to_anchor=(0.9, 1), loc='upper left')

lib/matplotlib/tests/test_figure.py

@@ -814,7 +814,7 @@ def test_tightbbox():
     ax.set_xlim(0, 1)
     t = ax.text(1., 0.5, 'This dangles over end')
     renderer = fig.canvas.get_renderer()
-    x1Nom0 = 8.9375  # inches
+    x1Nom0 = 8.9875  # inches
     assert abs(t.get_tightbbox(renderer).x1 - x1Nom0 * fig.dpi) < 2
     assert abs(ax.get_tightbbox(renderer).x1 - x1Nom0 * fig.dpi) < 2
     assert abs(fig.get_tightbbox(renderer).x1 - x1Nom0) < 0.05
@@ -1376,7 +1376,8 @@ def test_subfigure_dpi():
 
 
 @image_comparison(['test_subfigure_ss.png'], style='mpl20',
-                  savefig_kwarg={'facecolor': 'teal'}, tol=0.02)
+                  savefig_kwarg={'facecolor': 'teal'},
+                  tol=0.022)
 def test_subfigure_ss():
     # test assigning the subfigure via subplotspec
     np.random.seed(19680801)

lib/matplotlib/tests/test_ft2font.py

@@ -708,10 +708,10 @@ def test_ft2font_get_sfnt_table(font_name, header):
 
 @pytest.mark.parametrize('left, right, unscaled, unfitted, default', [
     # These are all the same class.
-    ('A', 'A', 57, 248, 256), ('A', 'À', 57, 248, 256), ('A', 'Á', 57, 248, 256),
-    ('A', 'Â', 57, 248, 256), ('A', 'Ã', 57, 248, 256), ('A', 'Ä', 57, 248, 256),
+    ('A', 'A', 57, 247, 256), ('A', 'À', 57, 247, 256), ('A', 'Á', 57, 247, 256),
+    ('A', 'Â', 57, 247, 256), ('A', 'Ã', 57, 247, 256), ('A', 'Ä', 57, 247, 256),
     # And a few other random ones.
-    ('D', 'A', -36, -156, -128), ('T', '.', -243, -1056, -1024),
+    ('D', 'A', -36, -156, -128), ('T', '.', -243, -1055, -1024),
     ('X', 'C', -149, -647, -640), ('-', 'J', 114, 495, 512),
 ])
 def test_ft2font_get_kerning(left, right, unscaled, unfitted, default):

lib/matplotlib/tests/test_mathtext.py

@@ -568,14 +568,14 @@ def test_box_repr():
         _mathtext.DejaVuSansFonts(fm.FontProperties(), LoadFlags.NO_HINTING),
         fontsize=12, dpi=100))
     assert s == textwrap.dedent("""\
-        Hlist<w=9.49 h=16.08 d=6.64 s=0.00>[
+        Hlist<w=9.51 h=15.81 d=6.57 s=0.00>[
           Hlist<w=0.00 h=0.00 d=0.00 s=0.00>[],
-          Hlist<w=9.49 h=16.08 d=6.64 s=0.00>[
-            Hlist<w=9.49 h=16.08 d=6.64 s=0.00>[
-              Vlist<w=7.40 h=22.72 d=0.00 s=6.64>[
-                HCentered<w=7.40 h=8.67 d=0.00 s=0.00>[
+          Hlist<w=9.51 h=15.81 d=6.57 s=0.00>[
+            Hlist<w=9.51 h=15.81 d=6.57 s=0.00>[
+              Vlist<w=7.43 h=22.38 d=0.00 s=6.57>[
+                HCentered<w=7.43 h=8.51 d=0.00 s=0.00>[
                   Glue,
-                  Hlist<w=7.40 h=8.67 d=0.00 s=0.00>[
+                  Hlist<w=7.43 h=8.51 d=0.00 s=0.00>[
                     `1`,
                     k2.36,
                   ],
@@ -584,9 +584,9 @@ def test_box_repr():
                 Vbox,
                 Hrule,
                 Vbox,
-                HCentered<w=7.40 h=8.84 d=0.00 s=0.00>[
+                HCentered<w=7.43 h=8.66 d=0.00 s=0.00>[
                   Glue,
-                  Hlist<w=7.40 h=8.84 d=0.00 s=0.00>[
+                  Hlist<w=7.43 h=8.66 d=0.00 s=0.00>[
                     `2`,
                     k2.02,
                   ],

lib/matplotlib/tests/test_text.py

@@ -720,8 +720,8 @@ def test_wrap(x, rotation, halign):
     s = 'This is a very long text that should be wrapped multiple times.'
     text = subfig.text(x, 0.7, s, wrap=True, rotation=rotation, ha=halign)
     fig.canvas.draw()
-    assert text._get_wrapped_text() == ('This is a very long text\n'
-                                        'that should be\n'
+    assert text._get_wrapped_text() == ('This is a very long\n'
+                                        'text that should be\n'
                                         'wrapped multiple\n'
                                         'times.')
 

subprojects/freetype-2.13.3.wrap

@@ -0,0 +1,13 @@
+[wrap-file]
+directory = freetype-2.13.3
+source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
+source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetype2/2.13.3/freetype-2.13.3.tar.xz
+source_filename = freetype-2.13.3.tar.xz
+source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
+
+# https://gitlab.freedesktop.org/freetype/freetype/-/commit/34aed655f1696da774b5cdd4c5effb312153232f
+diff_files = freetype-34aed655f1696da774b5cdd4c5effb312153232f.patch
+
+[provide]
+freetype2 = freetype_dep
+freetype = freetype_dep