From b2c1943ea5b777ed1b23cc080cdcdcf569934c90 Mon Sep 17 00:00:00 2001 From: pcpa Date: Thu, 28 Mar 2013 16:13:18 -0300 Subject: [PATCH] Correct rhbz #908717, #912843 and #928326 --- python-matplotlib-fontconfig.patch | 25 +++++++++++++++++++++++-- python-matplotlib.spec | 6 +++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/python-matplotlib-fontconfig.patch b/python-matplotlib-fontconfig.patch index 97e7baa..c6ad339 100644 --- a/python-matplotlib-fontconfig.patch +++ b/python-matplotlib-fontconfig.patch @@ -1,6 +1,6 @@ diff -up matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig matplotlib-1.2.0/lib/matplotlib/font_manager.py ---- matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig 2013-01-16 16:10:23.104026087 -0200 -+++ matplotlib-1.2.0/lib/matplotlib/font_manager.py 2013-01-16 18:44:12.691379520 -0200 +--- matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig 2013-02-24 22:50:54.932678576 -0300 ++++ matplotlib-1.2.0/lib/matplotlib/font_manager.py 2013-02-24 22:54:29.627686797 -0300 @@ -62,7 +62,7 @@ try: except ImportError: import pickle @@ -41,3 +41,24 @@ diff -up matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig matplotlib-1.2.0/l """ Return the default font size. """ +@@ -1282,7 +1286,7 @@ if USE_FONTCONFIG and sys.platform != 'w + return file + return None + +- _fc_match_regex = re.compile(r'\sfile:\s+"([^"]*)"') ++ _fc_match_regex = re.compile(br'\sfile:\s+"([^"]*)"') + _fc_match_cache = {} + + def findfont(prop, fontext='ttf'): +diff -up matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc.orig matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc +--- matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc.orig 2013-02-24 22:55:55.684690093 -0300 ++++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc 2013-02-24 22:57:00.146692561 -0300 +@@ -198,7 +198,7 @@ text.hinting_factor : 8 # Specifies the + #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 diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 4a9f4e2..51bd2c4 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -17,7 +17,7 @@ Name: python-matplotlib Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Python 2D plotting library Group: Development/Libraries License: Python @@ -301,6 +301,10 @@ popd %endif %changelog +* Thu Mar 28 2013 pcpa - 1.2.0-10 +- Use stix fonts avoid problems with missing cm fonts (#908717) +- Correct type mismatch in python3 font_manager (#912843, #928326) + * Thu Feb 14 2013 Fedora Release Engineering - 1.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild