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-Tag: V9_0_0~14^2~5^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4afa9190d46c9b18d0e747478744517c954a11d8;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..080f0d2
--- /dev/null
+++ b/config/patches/matplotlib.002_fix_paraview_gtk.patch
@@ -0,0 +1,44 @@
+diff -crB matplotlib-1.4.3/setup.py matplotlib-1.4.3p1/setup.py
+*** matplotlib-1.4.3/setup.py	2015-02-16 04:46:36.000000000 +0100
+--- matplotlib-1.4.3p1/setup.py	2015-03-24 14:24:46.000000000 +0100
+***************
+*** 91,109 ****
+      # 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.BackendQt5(),
+      setupext.BackendQt4(),
+      setupext.BackendPySide(),
+!     setupext.BackendGtk3Agg(),
+!     setupext.BackendGtk3Cairo(),
+!     setupext.BackendGtkAgg(),
+!     setupext.BackendTkAgg(),
+!     setupext.BackendWxAgg(),
+!     setupext.BackendGtk(),
+      setupext.BackendAgg(),
+!     setupext.BackendCairo(),
+!     setupext.Windowing(),
+      'Optional LaTeX dependencies',
+      setupext.DviPng(),
+      setupext.Ghostscript(),
+--- 91,109 ----
+      # 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.BackendQt5(),
+      setupext.BackendQt4(),
+      setupext.BackendPySide(),
+!     #setupext.BackendGtk3Agg(),
+!     #setupext.BackendGtk3Cairo(),
+!     #setupext.BackendGtkAgg(),
+!     #setupext.BackendTkAgg(),
+!     #setupext.BackendWxAgg(),
+!     #setupext.BackendGtk(),
+      setupext.BackendAgg(),
+!     #setupext.BackendCairo(),
+!     #setupext.Windowing(),
+      'Optional LaTeX dependencies',
+      setupext.DviPng(),
+      setupext.Ghostscript(),