From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 14 Jun 2017 15:30:42 +0000 (+0200)
Subject: Reformat matplotlib patch using diff -NaurwB
X-Git-Tag: V9_0_0~14^2~5^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=17dd212208f3d651a935d3f2d15420647b10e54b;p=tools%2Fconfiguration.git

Reformat matplotlib patch using diff -NaurwB
---

diff --git a/config/patches/matplotlib.002_fix_paraview_gtk.patch b/config/patches/matplotlib.002_fix_paraview_gtk.patch
index 080f0d2..c9c1e8c 100644
--- a/config/patches/matplotlib.002_fix_paraview_gtk.patch
+++ b/config/patches/matplotlib.002_fix_paraview_gtk.patch
@@ -1,44 +1,32 @@
-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(),
+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(),