Also bump the release

- use GTKAgg backend (#982793)
- R python3-matplotlib not python-matplotlib (#988412)

.gitignore

@@ -2,59 +2,3 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.0.1-without-gpc.tar.gz
 /mpl_sampledata-1.0.1.tar.gz
 /matplotlib-1.2.0-without-gpc.tar.gz
-/matplotlib-1.3.0-without-gpc.tar.xz
-/matplotlib-1.3.1-without-gpc.tar.xz
-/matplotlib-1.4.3-without-gpc.tar.xz
-/matplotlib-1.4.3-without-extern.tar.xz
-/matplotlib-1.5.1-without-extern.tar.xz
-/matplotlib-1.5.1.tar.gz
-/matplotlib-1.5.2rc2.tar.gz
-/matplotlib-2.0.0b4.tar.gz
-/matplotlib-2.0.0rc2.tar.gz
-/matplotlib-2.0.0.tar.gz
-/matplotlib-2.0.0-without-copyrighted.tar.xz
-/matplotlib-2.0.1.tar.gz
-/matplotlib-2.0.2.tar.gz
-/matplotlib-2.1.0rc1.tar.gz
-/matplotlib-2.1.0.tar.gz
-/matplotlib-2.1.1.tar.gz
-/matplotlib-2.1.2.tar.gz
-/matplotlib-2.1.2-with-freetype-2.8.tar.gz
-/matplotlib-2.2.2.tar.gz
-/matplotlib-2.2.2-with-freetype-2.8.tar.gz
-/matplotlib-2.2.2-with-freetype-2.9.tar.gz
-/matplotlib-2.2.3.tar.gz
-/matplotlib-2.2.3-with-freetype-2.8.tar.gz
-/matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc1.tar.gz
-/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc2.tar.gz
-/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0.tar.gz
-/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.1.tar.gz
-/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.2.tar.gz
-/matplotlib-3.0.3.tar.gz
-/matplotlib-3.1.0rc1.tar.gz
-/matplotlib-3.1.0.tar.gz
-/matplotlib-3.1.0-with-freetype-2.10.0.tar.gz
-/matplotlib-3.1.1.tar.gz
-/matplotlib-3.1.1-with-freetype-2.10.0.tar.gz
-/matplotlib-3.1.2.tar.gz
-/matplotlib-3.2.0rc3.tar.gz
-/matplotlib-3.2.0rc3-with-freetype-2.10.1.tar.gz
-/matplotlib-3.2.0.tar.gz
-/matplotlib-3.2.0-with-freetype-2.10.1.tar.gz
-/matplotlib-3.2.1.tar.gz
-/matplotlib-3.2.2.tar.gz
-/matplotlib-3.2.2-with-freetype-2.10.1.tar.gz
-/matplotlib-3.3.0rc1.tar.gz
-/matplotlib-3.3.0rc1-with-freetype-2.10.1.tar.gz
-/matplotlib-3.3.0.tar.gz
-/matplotlib-3.3.0-with-freetype-2.10.2.tar.gz
-/matplotlib-3.3.1.tar.gz
-/matplotlib-3.3.2.tar.gz
-/matplotlib-3.3.3.tar.gz
-/matplotlib-3.3.3-with-freetype-2.10.4.tar.gz
-/matplotlib-3.3.4.tar.gz

0001-matplotlibrc-path-search-fix.patch

@@ -1,69 +0,0 @@
-From 7d34e4c6cf3e9f0b68d0a7f70f5c832a24b74d7e Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Wed, 27 Sep 2017 19:35:59 -0400
-Subject: [PATCH 1/2] matplotlibrc path search fix
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/__init__.py | 28 ++++------------------------
- 1 file changed, 4 insertions(+), 24 deletions(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 1c47973f15..202acce525 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -536,33 +536,11 @@ def get_data_path(*, _from_rc=None):
- 
- @_logged_cached('(private) matplotlib data path: %s')
- def _get_data_path():
--    path = Path(__file__).with_name("mpl-data")
-+    path = (Path(__file__).parent.parent.parent.parent.parent /
-+            'share/matplotlib/mpl-data')
-     if path.is_dir():
-         return str(path)
- 
--    cbook.warn_deprecated(
--        "3.2", message="Matplotlib installs where the data is not in the "
--        "mpl-data subdirectory of the package are deprecated since %(since)s "
--        "and support for them will be removed %(removal)s.")
--
--    def get_candidate_paths():
--        # setuptools' namespace_packages may hijack this init file
--        # so need to try something known to be in Matplotlib, not basemap.
--        import matplotlib.afm
--        yield Path(matplotlib.afm.__file__).with_name('mpl-data')
--        # py2exe zips pure python, so still need special check.
--        if getattr(sys, 'frozen', None):
--            yield Path(sys.executable).with_name('mpl-data')
--            # Try again assuming we need to step up one more directory.
--            yield Path(sys.executable).parent.with_name('mpl-data')
--            # Try again assuming sys.path[0] is a dir not a exe.
--            yield Path(sys.path[0]) / 'mpl-data'
--
--    for path in get_candidate_paths():
--        if path.is_dir():
--            defaultParams['datapath'][0] = str(path)
--            return str(path)
--
-     raise RuntimeError('Could not find the matplotlib data files')
- 
- 
-@@ -583,6 +561,7 @@ def matplotlib_fname():
-           is not defined)
-     - On other platforms,
-       - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
-+    - ``/etc/matplotlibrc``
-     - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
-       exist.
-     """
-@@ -597,6 +576,7 @@ def matplotlib_fname():
-             yield matplotlibrc
-             yield os.path.join(matplotlibrc, 'matplotlibrc')
-         yield os.path.join(get_configdir(), 'matplotlibrc')
-+        yield '/etc/matplotlibrc'
-         yield os.path.join(_get_data_path(), 'matplotlibrc')
- 
-     for fname in gen_candidates():
--- 
-2.29.2
-

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

@@ -1,120 +0,0 @@
-From 40ed55c16c0d3f7d2365af5c6a8f99e02eadae31 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/2] Set FreeType version to 2.10.4 and update tolerances.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/__init__.py                     |  2 +-
- lib/matplotlib/tests/test_axes.py              |  4 ++--
- 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(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 202acce525..18731b7c4d 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1198,7 +1198,7 @@ default_test_modules = [
- def _init_tests():
-     # 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'
- 
-     from matplotlib import ft2font
-     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index e0b340da1e..9090c2930c 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6055,7 +6055,7 @@ def test_normal_axes():
-     ]
-     for nn, b in enumerate(bbaxis):
-         targetbb = mtransforms.Bbox.from_bounds(*target[nn])
--        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
-+        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
- 
-     target = [
-         [150.0, 119.999, 930.0, 11.111],
-@@ -6073,7 +6073,7 @@ def test_normal_axes():
- 
-     target = [85.5138, 75.88888, 1021.11, 1017.11]
-     targetbb = mtransforms.Bbox.from_bounds(*target)
--    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
-+    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
- 
-     # test that get_position roundtrips to get_window_extent
-     axbb = ax.get_position().transformed(fig.transFigure).bounds
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index 46e6b9663e..593b3fb3ee 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -398,4 +398,4 @@ def test_hidden_axes():
-     extents1 = np.copy(axs[0, 0].get_position().extents)
- 
-     np.testing.assert_allclose(
--        extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
-+        extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-2)
-diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
-index da9a77c825..a7a98ef59e 100644
---- a/lib/matplotlib/tests/test_polar.py
-+++ b/lib/matplotlib/tests/test_polar.py
-@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
-     fig.canvas.draw()
-     bb = ax.get_tightbbox(fig.canvas.get_renderer())
-     assert_allclose(
--        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
-+        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1)
- 
- 
- @check_figures_equal(extensions=["png"])
-diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
-index 9ad2e0a9a0..7c9085a314 100644
---- a/lib/matplotlib/tests/test_tightlayout.py
-+++ b/lib/matplotlib/tests/test_tightlayout.py
-@@ -171,12 +171,12 @@ def test_outward_ticks():
-     plt.tight_layout()
-     # These values were obtained after visual checking that they correspond
-     # to a tight layouting that did take the ticks into account.
--    ans = [[[0.091, 0.607], [0.433, 0.933]],
--           [[0.579, 0.607], [0.922, 0.933]],
--           [[0.091, 0.140], [0.433, 0.466]],
--           [[0.579, 0.140], [0.922, 0.466]]]
-+    ans = [[[0.09, 0.61], [0.43, 0.93]],
-+           [[0.58, 0.61], [0.92, 0.93]],
-+           [[0.09, 0.14], [0.43, 0.47]],
-+           [[0.58, 0.14], [0.92, 0.47]]]
-     for nn, ax in enumerate(fig.axes):
--        assert_array_equal(np.round(ax.get_position().get_points(), 3),
-+        assert_array_equal(np.round(ax.get_position().get_points(), 2),
-                            ans[nn])
- 
- 
-diff --git a/setupext.py b/setupext.py
-index dfa004d7f0..8ec77feed9 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -129,12 +129,16 @@ _freetype_hashes = {
-         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
-     '2.10.1':
-         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
-+    '2.10.2':
-+        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
-+    '2.10.4':
-+        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
- }
- # 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_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
- 
- 
--- 
-2.29.2
-

generate-tarball.sh

@@ -0,0 +1,19 @@
+#! /bin/sh
+
+version=$1
+
+[ -z $version ] && exit 1
+
+dir=matplotlib-${version}
+file=matplotlib-${version}.tar.gz
+result=matplotlib-${version}-without-gpc.tar.gz
+
+wget -vc http://downloads.sourceforge.net/matplotlib/$file
+
+rm -rf matplotlib-${version}
+tar xzf $file
+
+rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
+
+rm -f $result
+tar czf $result $dir

python-matplotlib-fontconfig.patch

@@ -0,0 +1,64 @@
+diff -ur matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py matplotlib-1.2.0/lib/matplotlib/font_manager.py
+--- matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py	2012-10-31 01:11:14.000000000 +0100
++++ matplotlib-1.2.0/lib/matplotlib/font_manager.py	2013-04-03 01:50:34.433802284 +0200
+@@ -62,7 +62,7 @@
+ except ImportError:
+     import pickle
+ 
+-USE_FONTCONFIG = False
++USE_FONTCONFIG = True
+ 
+ verbose = matplotlib.verbose
+ 
+@@ -771,7 +771,7 @@
+                 return float(self._size)
+             except ValueError:
+                 pass
+-        default_size = fontManager.get_default_size()
++        default_size = FontManager.get_default_size()
+         return default_size * font_scalings.get(self._size)
+ 
+     def get_file(self):
+@@ -991,7 +991,10 @@
+         self.afmfiles = findSystemFonts(paths, fontext='afm') + \
+             findSystemFonts(fontext='afm')
+         self.afmlist = createFontList(self.afmfiles, fontext='afm')
+-        self.defaultFont['afm'] = self.afmfiles[0]
++        try:
++            self.defaultFont['afm'] = self.afmfiles[0]
++        except IndexError:
++            self.defaultFont['afm'] = None
+ 
+         self.ttf_lookup_cache = {}
+         self.afm_lookup_cache = {}
+@@ -1002,7 +1005,8 @@
+         """
+         return self.__default_weight
+ 
+-    def get_default_size(self):
++    @staticmethod
++    def get_default_size():
+         """
+         Return the default font size.
+         """
+@@ -1276,7 +1280,7 @@
+         except OSError:
+             return None
+         if pipe.returncode == 0:
+-            for match in _fc_match_regex.finditer(output):
++            for match in _fc_match_regex.finditer(output.decode("utf-8")):
+                 file = match.group(1)
+                 if os.path.splitext(file)[1][1:] in fontexts:
+                     return file
+diff -ur matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc
+--- matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc	2012-11-08 17:39:20.000000000 +0100
++++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc	2013-04-03 01:50:03.693755542 +0200
+@@ -198,7 +198,7 @@
+ #mathtext.it  : serif:italic
+ #mathtext.bf  : serif:bold
+ #mathtext.sf  : sans
+-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
++mathtext.fontset : stix # Should be 'cm' (Computer Modern), 'stix',
+                        # 'stixsans' or 'custom'
+ #mathtext.fallback_to_cm : True  # When True, use symbols from the Computer Modern
+                                  # fonts when a symbol can not be found in one of

python-matplotlib-noagg.patch

@@ -0,0 +1,73 @@
+diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:49:21.295712608 -0200
++++ matplotlib-1.2.0/setupext.py	2012-11-23 14:49:31.508712999 -0200
+@@ -96,7 +96,6 @@ BUILT_GDK       = False
+ BUILT_PATH      = False
+ BUILT_TRI       = False
+ 
+-AGG_VERSION = 'agg24'
+ TCL_TK_CACHE = None
+ 
+ # for nonstandard installation/build with --prefix variable
+@@ -621,7 +620,8 @@ def add_agg_flags(module):
+     # before adding the freetype flags since -z comes later
+     add_base_flags(module)
+     add_numpy_flags(module)
+-    module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
++    module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
++    module.libraries.append('agg')
+ 
+     # put these later for correct link order
+     module.libraries.extend(std_libs)
+@@ -1220,17 +1220,7 @@ def build_agg(ext_modules, packages):
+     global BUILT_AGG
+     if BUILT_AGG: return # only build it if you you haven't already
+ 
+-    agg = (
+-           'agg_trans_affine.cpp',
+-           'agg_bezier_arc.cpp',
+-           'agg_curves.cpp',
+-           'agg_vcgen_dash.cpp',
+-           'agg_vcgen_stroke.cpp',
+-           'agg_image_filters.cpp',
+-           )
+-
+-    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
+-    deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
++    deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
+     deps.extend(glob.glob('CXX/*.cxx'))
+     deps.extend(glob.glob('CXX/*.c'))
+     temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
+@@ -1253,16 +1243,7 @@ def build_path(ext_modules, packages):
+     global BUILT_PATH
+     if BUILT_PATH: return # only build it if you you haven't already
+ 
+-    agg = (
+-           'agg_vcgen_contour.cpp',
+-           'agg_curves.cpp',
+-           'agg_bezier_arc.cpp',
+-           'agg_trans_affine.cpp',
+-           'agg_vcgen_stroke.cpp',
+-           )
+-
+-    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
+-    deps.extend(glob.glob('CXX/*.cxx'))
++    deps = glob.glob('CXX/*.cxx')
+     deps.extend(glob.glob('CXX/*.c'))
+ 
+     temp_copy('src/_path.cpp', 'src/path.cpp')
+@@ -1287,14 +1268,8 @@ def build_image(ext_modules, packages):
+     global BUILT_IMAGE
+     if BUILT_IMAGE: return # only build it if you you haven't already
+ 
+-    agg = ('agg_trans_affine.cpp',
+-           'agg_image_filters.cpp',
+-           'agg_bezier_arc.cpp',
+-           )
+-
+     temp_copy('src/_image.cpp', 'src/image.cpp')
+     deps = ['src/image.cpp', 'src/mplutils.cpp']
+-    deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
+     deps.extend(glob.glob('CXX/*.cxx'))
+     deps.extend(glob.glob('CXX/*.c'))
+ 

python-matplotlib-tk.patch

@@ -0,0 +1,35 @@
+diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:50:48.954715965 -0200
++++ matplotlib-1.2.0/setupext.py	2012-11-23 14:55:53.731727636 -0200
+@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
+ 
+     tcl_poss = [tcl_lib_dir,
+                 os.path.normpath(os.path.join(tcl_lib_dir, '..')),
+-                "/usr/lib/tcl"+str(Tkinter.TclVersion),
+-                "/usr/lib"]
++                "@@libdir@@/tcl"+str(Tkinter.TclVersion),
++                "@@libdir@@"]
+     tk_poss = [tk_lib_dir,
+                 os.path.normpath(os.path.join(tk_lib_dir, '..')),
+-               "/usr/lib/tk"+str(Tkinter.TkVersion),
+-               "/usr/lib"]
++               "@@libdir@@/tk"+str(Tkinter.TkVersion),
++               "@@libdir@@"]
+     for ptcl, ptk in zip(tcl_poss, tk_poss):
+         tcl_config = os.path.join(ptcl, "tclConfig.sh")
+         tk_config = os.path.join(ptk, "tkConfig.sh")
+@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
+     return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
+ 
+ def hardcoded_tcl_config():
+-    tcl_inc = "/usr/local/include"
+-    tk_inc = "/usr/local/include"
+-    tcl_lib = "/usr/local/lib"
+-    tk_lib = "/usr/local/lib"
++    tcl_inc = "/usr/include"
++    tk_inc = "/usr/include"
++    tcl_lib = "@@libdir@@"
++    tk_lib = "@@libdir@@"
+     return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
+ 
+ def add_tk_flags(module):

setup.cfg

@@ -1,8 +1,2 @@
-[libs]
-system_freetype = True
-system_qhull = True
-
-[packages]
-tests = True
-toolkits = True
-toolkits_tests = True
+[rc_options]
+backend = GTKAgg

sources

@@ -1,2 +1 @@
-SHA512 (matplotlib-3.3.4.tar.gz) = e29bcd17ea2b65c26c75421a319d3f21c5b0148c9e61d55d719c191c07342ed19032f97cde269647bd545ed45b5e142483e50caf29ffd421acde5b0b3bfa238b
-SHA512 (matplotlib-3.3.3-with-freetype-2.10.4.tar.gz) = b583842a24edc5deb39a3182797199081500fb089bff467a9e55d3612d8c049d43ed08385d42060271928f5cb02240599c7173a65c213fae9bafb2081c54c5a1
+2add984c264ecdfc4a212f914736b78c  matplotlib-1.2.0-without-gpc.tar.gz