[arch-commits] Commit in python-matplotlib/trunk (2 files)

[Felix Yan]

    Date: Friday, October 21, 2016 @ 08:03:06
  Author: felixonmars
Revision: 192797

upgpkg: python-matplotlib 1.5.3-1

Modified:
  python-matplotlib/trunk/PKGBUILD
Deleted:
  python-matplotlib/trunk/fix-for-pyqt5.7-support.patch

-------------------------------+
 PKGBUILD                      |   12 ++-------
 fix-for-pyqt5.7-support.patch |   52 ----------------------------------------
 2 files changed, 3 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-21 07:55:06 UTC (rev 192796)
+++ PKGBUILD	2016-10-21 08:03:06 UTC (rev 192797)
@@ -7,8 +7,8 @@
 
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.5.3
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url='http://matplotlib.org'
@@ -24,17 +24,11 @@
              'libxkbcommon-x11' 'python-pillow' 'python2-pillow' 'python-setuptools'
              'python2-setuptools' 'python-cycler' 'python2-cycler')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
-        fix-for-pyqt5.7-support.patch
         setup.cfg)
-sha512sums=('7d4688665273d30a08edf0cf2414cf0c05c619335f72b190c6ea125687e74cafe6133b7f3b6588e969c931ec8f970593d44654766205e6cc19f760925826a7e3'
-            '050158feaa5a72f2153a71fea7f42b3f0b37c68d3f1bf96cb7118dc2ff7e54337d25efa5118eaae707697db763b12a074392b807e79b29b704ae11b19d0f3bf2'
+sha512sums=('8b135a93d134646655f1defc0c1a58bee1488435b40643bb96d91724942395c71a41d0c9f77149097c233e3d9a9938d9e332dd21b62089e8932076380d74731b'
             '493a08914755d7d27d98025fc309f19cc3ec45e777fc81a56fa50430f90c0b39c2f66c2a01f6fd14a2e351005151365a25d2ab71ae2e80a54c6f57ceeacea35b')
 
 prepare() {
-   # Fix PyQt 5.7 support (FS#50266).
-   cd "$srcdir"/matplotlib-${pkgver}
-   patch -p1 -i ../fix-for-pyqt5.7-support.patch
-
    cp -a "$srcdir"/matplotlib-${pkgver}{,-py2}
 
    cd "$srcdir"/matplotlib-${pkgver}

Deleted: fix-for-pyqt5.7-support.patch
===================================================================
--- fix-for-pyqt5.7-support.patch	2016-10-21 07:55:06 UTC (rev 192796)
+++ fix-for-pyqt5.7-support.patch	2016-10-21 08:03:06 UTC (rev 192797)
@@ -1,52 +0,0 @@
-From 655c513a5e5440014677ee5afb08b0efa39f8e16 Mon Sep 17 00:00:00 2001
-From: Antony Lee <anntzer.lee at gmail.com>
-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(-)
-
-diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
-index 876eb36..81a80b2 100644
---- a/lib/matplotlib/backends/backend_qt5.py
-+++ b/lib/matplotlib/backends/backend_qt5.py
-@@ -474,18 +474,18 @@ def __init__(self, canvas, num):
- 
-         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()
-@@ -507,10 +507,6 @@ def notify_axes_change(fig):
-         self.canvas.figure.add_axobserver(notify_axes_change)
-         self.window.raise_()
- 
--    @QtCore.Slot()
--    def _show_message(self, s):
--        self.statusbar_label.setText(s)
--
-     def full_screen_toggle(self):
-         if self.window.isFullScreen():
-             self.window.showNormal()