From 75d0d8966b955adb3d1ad9c860d4dfe8341fe850 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Jan 24 2018 08:07:14 +0000 Subject: Add test images re-generated with FreeType 2.8. --- diff --git a/.gitignore b/.gitignore index 003fc18..f5347ce 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ matplotlib-1.0.0-without-gpc.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 diff --git a/python-matplotlib.spec b/python-matplotlib.spec index c263f77..290a188 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -65,6 +65,7 @@ Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?r Source1: setup.cfg # Fedora-specific patches. +Source1000: matplotlib-%{version}-with-freetype-2.8.tar.gz Patch1001: 0001-matplotlibrc-path-search-fix.patch Patch1002: 0002-TST-Increase-tolerances-for-FreeType-2.7.1.patch Patch1686: 0003-TST-Increase-some-tolerances-for-32-bit-systems.patch @@ -381,7 +382,13 @@ Requires: python3-tkinter %prep %autosetup -n matplotlib-%{version}%{?rctag} -N %patch1001 -p1 +%if %{fedora} > 26 +# Updated test images for FreeType 2.8. +gzip -dc %SOURCE1000 | tar xvf - --transform='s~^\([^/]\+\)/~lib/\1/tests/baseline_images/~' +%else +# Small tweaks to tolerances for FreeType 2.7.1. %patch1002 -p1 +%endif %ifarch i686 # Switch to full autosetup when 32-bit systems are dropped. %patch1686 -p1 diff --git a/sources b/sources index 504a6c7..33a00ad 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (matplotlib-2.1.2.tar.gz) = fd93901b12a7f47cdc36d38d18de43b0cc8623dcd5597cfc1177e63cf90b0c87f718135176e2c077cd1316566a394e09e8e8e9db2ce128ee7f03021cac45543e +SHA512 (matplotlib-2.1.2-with-freetype-2.8.tar.gz) = abe03cf24d653ecaefcda56b60631b7200d7e2d5078801f61270d5329da8e6767773a1347a1c9c7b457a0a12427c345d70e700c156dedab27275875f5bcbc439