extra/python-matplotlib to 3.8.0-1

extra/python-matplotlib/PKGBUILD

@@ -10,7 +10,7 @@
 #  - disable lto via setup.cfg
 
 pkgname=python-matplotlib
-pkgver=3.7.3
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=(x86_64)
@@ -43,21 +43,19 @@ checkdepends=(python-pytest python-pytest-xdist python-pytest-runner python-pyte
               jupyter-nbconvert jupyter-nbformat python-ipykernel
               python-pandas python-pikepdf python-pytz python-xarray
               noto-fonts-cjk wqy-zenhei python-xcffib)
-_tag=d14c8f9ec4fc9b0c726238215eaa3be31c0b041b # git rev-parse v${pkgver}
+_tag=babc9d1892ea4b223ab1dd1ff3c035471500b42e # git rev-parse v${pkgver}
-_ftver=2.12.1
+_ftver=2.13.1
 source=(git+https://github.com/matplotlib/matplotlib.git#tag=${_tag}?signed
         https://github.com/QuLogic/mpl-images/archive/v${pkgver}-with-freetype-${_ftver}/mpl-images-${pkgver}-ft${_ftver}.tar.gz
-        freetype.patch
+        freetype.patch)
-        $pkgname-pyparsing-3.1.0.patch::https://github.com/matplotlib/matplotlib/commit/5bdac1d6a200e48b8fd9e22a7e03602dd55c8bdc.patch)
 b2sums=('SKIP'
-        '0b6ed88fb6d1b0340f1458bc39776f1093f64ebd16ebc812b2dfa006c0f8b1b78d4a1f9d3d33a9ff7beda695cba56229b3b0055a7b6f40d8b5664781ad38323f'
+        'abe9fadceab2aa9b15a62f0dc69cd649910d4e50872ac8464a1019e0b900ef5f158005be61eddb445b6f5f8f33a0803d6643ddc8d1fe5f36ea6a721bccfc409e'
-        'b821f938cace434932a43b15b42b93d0f8eaffea4e28fbf1d5a7263ec947c26252bafccaea60c1a1cb2fad4c71280ca2cf62527994f270af2467a242287470bb'
+        'ccc679b9108342a9c0ceb67ccb1158c7409c7033e5b6ce3cb4ca53b9351b3aa8557a95f8a823ee5f1cd60be4b901230ba993e06db6977a8c7db1419ba0fe4983')
-        'e5b2170ffea480e3815830e4d4dacc6cb52e6f20ab34efb427eff87f8368c068055e6d0e7eebb735cdf36e31c17f330a0e50f8a30c81ec8bf69a23c4fd241315')
+validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10  # Elliott Sales de Andrade <quantum.analyst@gmail.com>
-validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10) # Elliott Sales de Andrade <quantum.analyst@gmail.com>
+              EB8322187FD451192E430A7279B3FEC456F12599) # Kyle Sunden <contact@ksunden.space>
 
 prepare() {
   cd matplotlib
-  patch -p1 < ../$pkgname-pyparsing-3.1.0.patch
   # Fix SCM detected version
   rm -r .git
   # Don't require oldest-supported-numpy

extra/python-matplotlib/freetype.patch

@@ -131,7 +131,7 @@ diff --git a/setupext.py b/setupext.py
 index 69835c12f7..79ee6174e1 100644
 --- a/setupext.py
 +++ b/setupext.py
-@@ -168,13 +168,23 @@ _freetype_hashes = {
+@@ -168,14 +168,28 @@ _freetype_hashes = {
          '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
      '2.10.1':
          '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
@@ -148,19 +148,24 @@ index 69835c12f7..79ee6174e1 100644
 +        '7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c',
 +    '2.12.1':
 +        'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938',
++    '2.13.0':
++        'a7aca0e532a276ea8d85bd31149f0a74c33d19c8d287116ef8f5f8357b4f1f80',
++    '2.13.1':
++        '0b109c59914f25b4411a8de2a506fdd18fa8457eb86eca6c7b15c19110a92fa5',
  }
  # This is the version of FreeType to use when building a local version.  It
  # must match the value in lib/matplotlib.__init__.py, and the cache path in
- # `.circleci/config.yml`.
+ # `.circleci/config.yml`. Also update the docs in
+ # `docs/devel/dependencies.rst`.
 -TESTING_VERSION_OF_FREETYPE = '2.6.1'
-+TESTING_VERSION_OF_FREETYPE = '2.12.1'
++TESTING_VERSION_OF_FREETYPE = '2.13.1'
  if sys.platform.startswith('win') and platform.machine() == 'ARM64':
      # older versions of freetype are not supported for win/arm64
      # Matplotlib tests will not pass
-@@ -584,6 +594,7 @@ class FreeType(SetupPackage):
+@@ -599,6 +615,7 @@ class FreeType(SetupPackage):
-             ext.extra_objects.insert(
+                 name = ext.name.split('.')[-1]
-                 0, str(src_path / 'objs' / '.libs' / libfreetype))
+                 ext.extra_link_args.append(
-             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
+                     f'-Wl,-exported_symbol,_PyInit_{name}')
 +            ext.libraries.append('brotlidec')
  
      def do_custom_build(self, env):

extra/python-matplotlib/keys/pgp/EB8322187FD451192E430A7279B3FEC456F12599.asc

@@ -0,0 +1,78 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+of5VjD/C+NgBznk=
+=99aD
+-----END PGP PUBLIC KEY BLOCK-----