[Python-modules-commits] [matplotlib] 14/16: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository matplotlib.

commit ec5a443982196265266745cbd2a003790b7254af
Merge: 8654f0b 2a95e2a
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Aug 30 22:02:06 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...3a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/matplotlib/backends/backend_qt5.py             | 14 ++----
 4 files changed, 63 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 15f9fe8,0000000..9036d24
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0d04631d3b17374190747400bc89debe4bd2b9a6
- 0d04631d3b17374190747400bc89debe4bd2b9a6
++2a95e2a75f2f536c98df9695c71ddb5610993eac
++2a95e2a75f2f536c98df9695c71ddb5610993eac
 +571c0cec6896052900ada57484fce14ae2b791f4
 +571c0cec6896052900ada57484fce14ae2b791f4
 +matplotlib_1.5.2.orig.tar.gz
 +2c78d4b1d9cc1e064a7592158977cb22d6606ca7
 +50914982
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-From-655c513a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.patch
index 0000000,0000000..959d62d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-From-655c513a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.patch
@@@ -1,0 -1,0 +1,55 @@@
++From 2a95e2a75f2f536c98df9695c71ddb5610993eac Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Tue, 30 Aug 2016 22:01:26 +0100
++Subject: =?UTF-8?q?From=20655c513a5e5440014677ee5afb08b0efa39f8e16=20Mon?=
++ =?UTF-8?q?=20Sep=2017=2000:00:00=202001=0AFrom:=20Antony=20Lee=20<anntzer?=
++ =?UTF-8?q?.lee at gmail.com>=0ADate:=20Thu,=2028=20Jul=202016=2019:26:02=20-?=
++ =?UTF-8?q?0700=0ASubject:=20[PATCH]=20Fix=20for=20PyQt5.7=20support.?=
++
++Just getting rid of a slot with an incorrect signature (for which
++PyQt5.7 is more strict).
++
++Tested on PyQt5.6.1 and 5.7, PyQt4.11.4, PySide 1.2.4.
++---
++ lib/matplotlib/backends/backend_qt5.py | 14 +++++---------
++ 1 file changed, 5 insertions(+), 9 deletions(-)
++
++diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
++index d89f3b9..f92c06f 100644
++--- a/lib/matplotlib/backends/backend_qt5.py
+++++ b/lib/matplotlib/backends/backend_qt5.py
++@@ -459,18 +459,18 @@ class FigureManagerQT(FigureManagerBase):
++ 
++         self.window._destroying = False
++ 
+++        # add text label to status bar
+++        self.statusbar_label = QtWidgets.QLabel()
+++        self.window.statusBar().addWidget(self.statusbar_label)
+++
++         self.toolbar = self._get_toolbar(self.canvas, self.window)
++         if self.toolbar is not None:
++             self.window.addToolBar(self.toolbar)
++-            self.toolbar.message.connect(self._show_message)
+++            self.toolbar.message.connect(self.statusbar_label.setText)
++             tbs_height = self.toolbar.sizeHint().height()
++         else:
++             tbs_height = 0
++ 
++-        # add text label to status bar
++-        self.statusbar_label = QtWidgets.QLabel()
++-        self.window.statusBar().addWidget(self.statusbar_label)
++-
++         # resize the main window so it will display the canvas with the
++         # requested size:
++         cs = canvas.sizeHint()
++@@ -491,10 +491,6 @@ class FigureManagerQT(FigureManagerBase):
++                 self.toolbar.update()
++         self.canvas.figure.add_axobserver(notify_axes_change)
++ 
++-    @QtCore.Slot()
++-    def _show_message(self, s):
++-        self.statusbar_label.setText(s)
++-
++     def full_screen_toggle(self):
++         if self.window.isFullScreen():
++             self.window.showNormal()
diff --cc debian/patches/series
index c1bc696,0000000..bd19c7c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +20_matplotlibrc_path_search_fix.patch
 +70_bts720549_try_StayPuft_for_xkcd.patch
 +multiarch-tktcl.patch
 +gtk3cairo_check_no-multiprocessing.patch
 +0005-bts800803-disable-the-GitHub-Fork-Me-ribbon.patch
 +0006-bts800803-dont-use-the-Raleway-font-from-the-Google-.patch
 +0007-bts800803-remote-the-Google-Analytics-tracking.patch
++0008-From-655c513a5e5440014677ee5afb08b0efa39f8e16-Mon-Se.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git