Update test images for FreeType 2.11.0.

.gitignore

@@ -64,3 +64,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-3.4.1.tar.gz
 /matplotlib-3.4.1-with-freetype-2.10.4.tar.gz
 /matplotlib-3.4.2.tar.gz
+/matplotlib-3.4.1-with-freetype-2.11.0.tar.gz

0002-Set-FreeType-version-to-2.11.0-and-update-tolerances.patch

@@ -1,7 +1,7 @@
-From 69ecaadda7a7f59130056458ce9ca6a231aebf5a Mon Sep 17 00:00:00 2001
+From 322fe366ece11ae948c7f6ba0191f7dbc5db444b Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Fri, 14 Feb 2020 06:05:42 -0500
-Subject: [PATCH 2/4] Set FreeType version to 2.10.4 and update tolerances.
+Subject: [PATCH 2/4] Set FreeType version to 2.11.0 and update tolerances.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
@@ -10,11 +10,11 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  lib/matplotlib/tests/test_constrainedlayout.py |  2 +-
  lib/matplotlib/tests/test_polar.py             |  2 +-
  lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
- setupext.py                                    |  6 +++++-
- 6 files changed, 15 insertions(+), 11 deletions(-)
+ setupext.py                                    |  9 ++++++++-
+ 6 files changed, 18 insertions(+), 11 deletions(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 9d795f65f5..5755ad73da 100644
+index 9d795f65f5..f01024109b 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
 @@ -1137,7 +1137,7 @@ default_test_modules = [
@@ -22,7 +22,7 @@ index 9d795f65f5..5755ad73da 100644
      # The version of FreeType to install locally for running the
      # tests.  This must match the value in `setupext.py`
 -    LOCAL_FREETYPE_VERSION = '2.6.1'
-+    LOCAL_FREETYPE_VERSION = '2.10.4'
++    LOCAL_FREETYPE_VERSION = '2.11.0'
  
      from matplotlib import ft2font
      if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
@@ -97,10 +97,10 @@ index 23d363b508..e94c863477 100644
  
  
 diff --git a/setupext.py b/setupext.py
-index d8d0b6b393..aabb7ed9fd 100644
+index d8d0b6b393..45cab7d036 100644
 --- a/setupext.py
 +++ b/setupext.py
-@@ -167,12 +167,16 @@ _freetype_hashes = {
+@@ -167,12 +167,18 @@ _freetype_hashes = {
          '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
      '2.10.1':
          '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
@@ -108,16 +108,26 @@ index d8d0b6b393..aabb7ed9fd 100644
 +        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
 +    '2.10.4':
 +        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
++    '2.11.0':
++        'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
  }
  # This is the version of FreeType to use when building a local
  # version.  It must match the value in
  # lib/matplotlib.__init__.py and also needs to be changed below in the
  # embedded windows build script (grep for "REMINDER" in this file)
 -LOCAL_FREETYPE_VERSION = '2.6.1'
-+LOCAL_FREETYPE_VERSION = '2.10.4'
++LOCAL_FREETYPE_VERSION = '2.11.0'
  LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
  
  LOCAL_QHULL_VERSION = '2020.2'
+@@ -565,6 +571,7 @@ class FreeType(SetupPackage):
+             ext.extra_objects.insert(
+                 0, str(src_path / 'objs' / '.libs' / libfreetype))
+             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
++            ext.libraries.append('brotlidec')
+ 
+     def do_custom_build(self, env):
+         # We're using a system freetype
 -- 
 2.31.1
 

0003-Slightly-increase-tolerance-on-rcupdate-test.patch

@@ -1,4 +1,4 @@
-From e633708795ea2626accc491ef2b118b256015119 Mon Sep 17 00:00:00 2001
+From d807e4e108073ee0fbda02340b206bf3766d9c7c Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Fri, 4 Jun 2021 02:32:31 -0400
 Subject: [PATCH 3/4] Slightly increase tolerance on rcupdate test.

0004-Use-new-style-for-test_text_urls_tex.patch

@@ -1,4 +1,4 @@
-From b16f2142a12ef2c49d366634d7798075d1905553 Mon Sep 17 00:00:00 2001
+From ea96e5684af98e28e704dc26f12b793c6032ada6 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Fri, 4 Jun 2021 03:20:38 -0400
 Subject: [PATCH 4/4] Use new style for test_text_urls_tex.

python-matplotlib.spec

@@ -44,12 +44,12 @@
 %global mpl_images_version 3.4.1
 
 # The version of FreeType in this Fedora branch.
-%global ftver 2.10.4
+%global ftver 2.11.0
 
 Name:           python-matplotlib
 Version:        3.4.2
 %global Version 3.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python 2D plotting library
 # qt4_editor backend is MIT
 # ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is Public Domain
@@ -469,6 +469,9 @@ PYTHONDONTWRITEBYTECODE=1 \
 
 
 %changelog
+* Mon Aug 09 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-5
+- Update test images for FreeType 2.11.0
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 SHA512 (matplotlib-3.4.2.tar.gz) = 9f285fd828c543c0fe424fec332bac65d56b9df8be400911546975af9185d703c19d18acab2fe042450b51c9f3bb32e714994603070cdb7470097382f1727d8d
-SHA512 (matplotlib-3.4.1-with-freetype-2.10.4.tar.gz) = 37d665e7120fc842e41e2b94b27c42e3e14d1f0a3ff27c8672e5eb3be6c2e68bb7882aea61383ebab324dcbc11b1c2df3b8d0aba77be83a241186aa1e79a3350
+SHA512 (matplotlib-3.4.1-with-freetype-2.11.0.tar.gz) = 762ecdbf15a7d1560e5602c575be96844dc10601b9f134d2e81e11f23738c2a9c3063989373e8971f03a0a09673fc5f9dd36775b1029ebe915d7ef740bd37cec