From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 14 Jun 2017 15:19:37 +0000 (+0200)
Subject: Update patch and add a new one for matplotlib
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=83a6f99cfa1c8227ca2ccda61dbfc516da269ac3;p=tools%2Fconfiguration.git

Update patch and add a new one for matplotlib

Build procedure is updated to use Qt5.
New patch allows to pass gtk tests with paraview.
---

diff --git a/config/patches/matplotlib.001_build_procedure.patch b/config/patches/matplotlib.001_build_procedure.patch
index c74de89..c0aae3d 100644
--- a/config/patches/matplotlib.001_build_procedure.patch
+++ b/config/patches/matplotlib.001_build_procedure.patch
@@ -25,7 +25,7 @@ diff -NaurwB matplotlib-1.4.3__1/setup.cfg matplotlib-1.4.3__0/setup.cfg
 +#
 +tests = False
 +sample_data = False
-+toolkits = False
++toolkits = True
 +# Tests for the toolkits are only automatically installed
 +# if the tests and toolkits packages are also getting installed.
 +#toolkits_tests = auto
@@ -70,7 +70,7 @@ diff -NaurwB matplotlib-1.4.3__1/setup.cfg matplotlib-1.4.3__0/setup.cfg
 +#gtkagg = auto
 +#macosx = auto
 +#pyside = auto
-+qt4agg = 
++qt5agg = auto
 +#tkagg = auto
 +#windowing = auto
 +#wxagg = auto
@@ -86,5 +86,5 @@ diff -NaurwB matplotlib-1.4.3__1/setup.cfg matplotlib-1.4.3__0/setup.cfg
 +# if you have disabled the relevent extension modules.  Agg will be used
 +# by default.
 +#
-+backend = 
++backend = Qt5Agg
 +#
diff --git a/config/patches/matplotlib.002_fix_paraview_gtk.patch b/config/patches/matplotlib.002_fix_paraview_gtk.patch
new file mode 100644
index 0000000..c9c1e8c
--- /dev/null
+++ b/config/patches/matplotlib.002_fix_paraview_gtk.patch
@@ -0,0 +1,32 @@
+diff -NaurwB a/setup.py b/setup.py
+--- a/setup.py	2015-02-16 04:46:36.000000000 +0100
++++ b/setup.py	2017-06-14 17:28:25.170778052 +0200
+@@ -91,19 +91,19 @@
+     # These backends are listed in order of preference, the first
+     # being the most preferred.  The first one that looks like it will
+     # work will be selected as the default backend.
+-    setupext.BackendMacOSX(),
++    #setupext.BackendMacOSX(),
+     setupext.BackendQt5(),
+     setupext.BackendQt4(),
+     setupext.BackendPySide(),
+-    setupext.BackendGtk3Agg(),
+-    setupext.BackendGtk3Cairo(),
+-    setupext.BackendGtkAgg(),
+-    setupext.BackendTkAgg(),
+-    setupext.BackendWxAgg(),
+-    setupext.BackendGtk(),
++    #setupext.BackendGtk3Agg(),
++    #setupext.BackendGtk3Cairo(),
++    #setupext.BackendGtkAgg(),
++    #setupext.BackendTkAgg(),
++    #setupext.BackendWxAgg(),
++    #setupext.BackendGtk(),
+     setupext.BackendAgg(),
+-    setupext.BackendCairo(),
+-    setupext.Windowing(),
++    #setupext.BackendCairo(),
++    #setupext.Windowing(),
+     'Optional LaTeX dependencies',
+     setupext.DviPng(),
+     setupext.Ghostscript(),