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

[Fabio Castelli]

    Date: Sunday, July 9, 2017 @ 16:59:39
  Author: muflone
Revision: 243439

upgpkg: spyder 3.1.4-2

Added:
  spyder/trunk/bug_54508_missing_pyqt4_qtwebkit.patch
Modified:
  spyder/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   14 +++++++++++---
 bug_54508_missing_pyqt4_qtwebkit.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-09 16:57:11 UTC (rev 243438)
+++ PKGBUILD	2017-07-09 16:59:39 UTC (rev 243439)
@@ -6,7 +6,7 @@
 pkgbase='spyder'
 pkgname=('spyder' 'spyder3')
 pkgver=3.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
 makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx')
 arch=('any')
@@ -16,13 +16,21 @@
         "python2.patch"
         "python2-optional-nbconvert.patch"
         "python2-pep8.patch"
-        "python3-pep8.patch")
+        "python3-pep8.patch"
+        "bug_54508_missing_pyqt4_qtwebkit.patch")
 sha256sums=('bcd75ebe65309a5f9184eedc59c415fe0d09e9b54a2b51bc31199a6095cd0b85'
             '4fb415fb358371da4a8b9524712de9338d391eed3bdabc5e217cf54f558771b5'
             'f6afdd08971a2022649af0be70cac67aa4d95fff06ade57f708693cffe073528'
             'dbebf909bf59027d22247e3e3c1736b5ec9337a879358f8117a967bb03e913b2'
-            'f4eba4c414e655f0f2797e9864aa199607a6706f6b245aca56a54b250febc382')
+            'f4eba4c414e655f0f2797e9864aa199607a6706f6b245aca56a54b250febc382'
+            '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5')
 
+prepare() {
+  cd "${pkgbase}-${pkgver}"
+  # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
+  patch -p1 -i "../bug_54508_missing_pyqt4_qtwebkit.patch"
+}
+
 package_spyder() {
   pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 2.x series.'
   depends=('python2-pyqt5' 'qt5-webkit' 'python2-qtconsole' 'python2-qtpy' 'python2-qtawesome'

Added: bug_54508_missing_pyqt4_qtwebkit.patch
===================================================================
--- bug_54508_missing_pyqt4_qtwebkit.patch	                        (rev 0)
+++ bug_54508_missing_pyqt4_qtwebkit.patch	2017-07-09 16:59:39 UTC (rev 243439)
@@ -0,0 +1,24 @@
+diff -Naur spyder-3.1.4.orig/scripts/spyder spyder-3.1.4/scripts/spyder
+--- spyder-3.1.4.orig/scripts/spyder	2017-04-24 02:30:23.000000000 +0200
++++ spyder-3.1.4/scripts/spyder	2017-07-09 18:47:22.072698407 +0200
+@@ -1,3 +1,8 @@
+ #!/usr/bin/env python
++
++# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
++import os
++os.environ['QT_API'] = 'pyqt5'
++
+ from spyder.app import start
+ start.main()
+diff -Naur spyder-3.1.4.orig/scripts/spyder3 spyder-3.1.4/scripts/spyder3
+--- spyder-3.1.4.orig/scripts/spyder3	2017-04-24 02:30:23.000000000 +0200
++++ spyder-3.1.4/scripts/spyder3	2017-07-09 18:47:27.659425267 +0200
+@@ -1,3 +1,8 @@
+ #! /usr/bin/python3
++
++# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
++import os
++os.environ['QT_API'] = 'pyqt5'
++
+ from spyder.app import start
+ start.main()