Fix return type in get_data_path patch.

And update the flaky test patch to work again.

0001-matplotlibrc-path-search-fix.patch

@@ -1,4 +1,4 @@
-From 40ffe133485dba72cdfcb50ec4a11ef69e92c7ea Mon Sep 17 00:00:00 2001
+From d3b2da006a21a9cc69ce6181497efab84b23ef0d 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/6] matplotlibrc path search fix
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 0361a37aed..d58e5c3278 100644
+index 0361a37aed..7f7005f915 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
 @@ -524,7 +524,8 @@ def get_cachedir():
@@ -17,7 +17,7 @@ index 0361a37aed..d58e5c3278 100644
  def get_data_path():
      """Return the path to Matplotlib data."""
 -    return str(Path(__file__).with_name("mpl-data"))
-+    return (Path(__file__).parent.parent.parent.parent.parent /
++    return str(Path(__file__).parent.parent.parent.parent.parent /
 +               'share/matplotlib/mpl-data')
  
  

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

@@ -1,4 +1,4 @@
-From 91ec30ea100a1632b6843b201554f28363aa1677 Mon Sep 17 00:00:00 2001
+From d5f27523c1b620a1288d3ffbb173d945d0c88555 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/6] Set FreeType version to 2.11.0 and update tolerances.
@@ -15,7 +15,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  7 files changed, 23 insertions(+), 13 deletions(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index d58e5c3278..b28e192138 100644
+index 7f7005f915..5961fdffd8 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
 @@ -1199,7 +1199,7 @@ default_test_modules = [

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

@@ -1,4 +1,4 @@
-From 24874d70222f64e221d8769d02fe91fe01554b1e Mon Sep 17 00:00:00 2001
+From 4542a34eb2ddc6f39e5bad3d2b1c24230cbbdc5f 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/6] Slightly increase tolerance on rcupdate test.

0004-Ensure-full-environment-is-passed-to-headless-test.patch

@@ -1,4 +1,4 @@
-From 58debfaafeabc791b49dd9e3f2461b9cfe9812ab Mon Sep 17 00:00:00 2001
+From 54b7d56a0e51c44a579e6177921aa9562b0e7160 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Tue, 24 Aug 2021 03:28:52 -0400
 Subject: [PATCH 4/6] Ensure full environment is passed to headless test.

0005-Increase-a-few-test-tolerances-on-some-arches.patch

@@ -1,4 +1,4 @@
-From 6279bb6519e33fa875a30fab4fcf86d4f05adafd Mon Sep 17 00:00:00 2001
+From 383fc4380bdc8d14d65ba48f012fd11e1d557348 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Tue, 24 Aug 2021 04:47:50 -0400
 Subject: [PATCH 5/6] Increase a few test tolerances on some arches.

0006-Fix-broken-QApplication-init-in-a-test.patch

@@ -1,23 +1,26 @@
-From 05a681ce00edf6c2400d1989b68a7607c539f3a8 Mon Sep 17 00:00:00 2001
+From d4386df74371c2dcec9bb1a7f588f46639087c49 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Tue, 24 Aug 2021 05:03:15 -0400
 Subject: [PATCH 6/6] Fix broken QApplication init in a test.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/tests/test_backend_qt.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ lib/matplotlib/tests/test_backend_qt.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
-index b7fb708bee..2ee03939a6 100644
+index b7fb708bee..ff104fcfbe 100644
 --- a/lib/matplotlib/tests/test_backend_qt.py
 +++ b/lib/matplotlib/tests/test_backend_qt.py
-@@ -380,7 +380,7 @@ def test_canvas_reinit():
+@@ -379,8 +379,9 @@ def test_canvas_reinit():
+ 
  @pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
  def test_form_widget_get_with_datetime_and_date_fields():
-     if not QtWidgets.QApplication.instance():
+-    if not QtWidgets.QApplication.instance():
 -        QtWidgets.QApplication()
-+        QtWidgets.QApplication([])
++    from matplotlib.backends.backend_qt import _create_qApp
++    _create_qApp()
++
      form = [
          ("Datetime field", datetime(year=2021, month=3, day=11)),
          ("Date field", date(year=2021, month=3, day=11))