tags 835455 +pending +patch thanks Dear maintainer,
I have prepared an NMU (versioned as 1.5.2~rc2-1.1) and uploaded to DELAYED/15. Please fell free to tell me if I should delay it longer, cancel or reschedule. Diff is attached. Best regards Anton
diff -Nru matplotlib-1.5.2~rc2/debian/changelog matplotlib-1.5.2~rc2/debian/changelog --- matplotlib-1.5.2~rc2/debian/changelog 2016-05-30 20:36:55.000000000 +0200 +++ matplotlib-1.5.2~rc2/debian/changelog 2016-08-25 22:29:19.000000000 +0200 @@ -1,3 +1,10 @@ +matplotlib (1.5.2~rc2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix for PyQt5.7 support. (Closes: #835455) + + -- Anton Gladky <[email protected]> Thu, 25 Aug 2016 22:29:19 +0200 + matplotlib (1.5.2~rc2-1) unstable; urgency=medium [ Sandro Tosi ] diff -Nru matplotlib-1.5.2~rc2/debian/patches/plot_fix.patch matplotlib-1.5.2~rc2/debian/patches/plot_fix.patch --- matplotlib-1.5.2~rc2/debian/patches/plot_fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ matplotlib-1.5.2~rc2/debian/patches/plot_fix.patch 2016-08-25 22:28:55.000000000 +0200 @@ -0,0 +1,52 @@ +From 655c513a5e5440014677ee5afb08b0efa39f8e16 Mon Sep 17 00:00:00 2001 +From: Antony Lee <[email protected]> +Date: Thu, 28 Jul 2016 19:26:02 -0700 +Subject: [PATCH] Fix for PyQt5.7 support. + +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(-) + +Index: matplotlib-1.5.2~rc2/lib/matplotlib/backends/backend_qt5.py +=================================================================== +--- matplotlib-1.5.2~rc2.orig/lib/matplotlib/backends/backend_qt5.py ++++ matplotlib-1.5.2~rc2/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 -Nru matplotlib-1.5.2~rc2/debian/patches/series matplotlib-1.5.2~rc2/debian/patches/series --- matplotlib-1.5.2~rc2/debian/patches/series 2016-05-30 20:36:55.000000000 +0200 +++ matplotlib-1.5.2~rc2/debian/patches/series 2016-08-25 22:28:44.000000000 +0200 @@ -5,3 +5,4 @@ 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 +plot_fix.patch
