[arch-commits] Commit in spyder/trunk (PKGBUILD bug_51437_spyder2.patch)

[Fabio Castelli]

    Date: Saturday, August 11, 2018 @ 23:01:04
  Author: muflone
Revision: 371190

upgpkg: spyder 3.3.1-1

Modified:
  spyder/trunk/PKGBUILD
  spyder/trunk/bug_51437_spyder2.patch

-------------------------+
 PKGBUILD                |   15 +++++++--------
 bug_51437_spyder2.patch |   36 +++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-11 22:43:25 UTC (rev 371189)
+++ PKGBUILD	2018-08-11 23:01:04 UTC (rev 371190)
@@ -5,7 +5,7 @@
 
 pkgbase='spyder'
 pkgname=('spyder2' 'spyder3')
-pkgver=3.3.0
+pkgver=3.3.1
 pkgrel=1
 pkgdesc='The Scientific Python Development Environment'
 makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx'
@@ -18,11 +18,11 @@
         "bug_53489_python2-optional-nbconvert.patch"
         "bug_54508_missing_pyqt4_qtwebkit.patch"
         "bug_51437_spyder2.patch")
-sha256sums=('2d7ce1bd19cc3e1c8eb30cc42f12c50caed60aeb2f1d7e1871201785e4ec327b'
+sha256sums=('a28c9eb919389739432d7243b533beb5973ed8415b3f00de894a6a15552a0b5d'
             '84b8d5e9640d5d347ac4564130f217368cc3f823de30b458d467a05e60bbc8da'
             '7486faba90da062ef8da6912bfabd22b59343b1275758f04e4a41df2b3b8eec0'
             '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5'
-            '4773c1b88816e696d7238cc7a1881dc5e954bbab633455af15fcbebcc3923745')
+            'bc94729fcf378ff1fa4ed028c4f3092acab1a098f608a121af5f8801772c28a0')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -45,14 +45,13 @@
 
   # Prepare sources for spyder3 build
   cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder3-${pkgver}"
-  cd "${srcdir}/spyder3-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/spyder2-${pkgver}"
   python2 setup.py build
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/spyder3-${pkgver}"
   python3 setup.py build
 }
 
@@ -61,7 +60,7 @@
   depends=('python2-pyqt5' 'qt5-webkit' 'python2-qtconsole' 'python2-qtpy' 'python2-qtawesome'
            'python2-pyflakes' 'python2-pyzmq' 'python2-pygments' 'python2-psutil' 'python2-pickleshare'
            'python2-rope' 'python2-jedi' 'python2-pylint' 'python2-pycodestyle' 'python2-sphinx'
-           'python2-opengl' 'python2-spyder-kernels' 'icu' 'gtk-update-icon-cache'
+           'python2-opengl' 'python2-spyder-kernels<1.0' 'icu' 'gtk-update-icon-cache'
            'desktop-file-utils')
   provides=('spyder')
   conflicts=('spyder')
@@ -92,7 +91,7 @@
            'python-pyflakes' 'python-pyzmq' 'python-pygments' 'python-psutil' 'python-pickleshare'
            'jupyter' 'jupyter-nbconvert'
            'python-rope' 'python-jedi' 'python-pylint' 'python-pycodestyle' 'python-sphinx'
-           'python-opengl' 'python-spyder-kernels' 'icu' 'gtk-update-icon-cache'
+           'python-opengl' 'python-spyder-kernels<1.0' 'icu' 'gtk-update-icon-cache'
            'desktop-file-utils')
   optdepends=('python-numpy: N-dimensional arrays'
               'python-scipy: signal/image processing'

Modified: bug_51437_spyder2.patch
===================================================================
--- bug_51437_spyder2.patch	2018-08-11 22:43:25 UTC (rev 371189)
+++ bug_51437_spyder2.patch	2018-08-11 23:01:04 UTC (rev 371190)
@@ -1,33 +1,31 @@
-diff -Naur spyder-3.2.7.orig/scripts/spyder3.desktop spyder-3.2.7/scripts/spyder3.desktop
---- spyder-3.2.7.orig/scripts/spyder3.desktop	2018-02-25 17:17:21.000000000 +0100
-+++ spyder-3.2.7/scripts/spyder3.desktop	2018-03-03 20:15:01.330490153 +0100
-@@ -1,9 +1,8 @@
+diff -Naur spyder-3.3.1.orig/scripts/spyder3.desktop spyder-3.3.1/scripts/spyder3.desktop
+--- spyder-3.3.1.orig/scripts/spyder3.desktop	2018-08-11 23:31:15.000000000 +0200
++++ spyder-3.3.1/scripts/spyder3.desktop	2018-08-12 00:36:04.710353620 +0200
+@@ -1,8 +1,7 @@
  [Desktop Entry]
  Type=Application
  Version=1.0
 -Name=Spyder3
 -GenericName=Spyder3
--Comment=Scientific PYthon Development EnviRonment - Python3
 +Name=Spyder for Python 3.x
-+Comment=Scientific PYthon Development EnviRonment - Python 3.x
+ Comment=The Scientific Python Development Environment - Python 3
  Icon=spyder3
  TryExec=spyder3
- Exec=spyder3 %F
-diff -Naur spyder-3.2.7.orig/scripts/spyder.desktop spyder-3.2.7/scripts/spyder.desktop
---- spyder-3.2.7.orig/scripts/spyder.desktop	2018-02-25 17:17:21.000000000 +0100
-+++ spyder-3.2.7/scripts/spyder.desktop	2018-03-03 20:16:20.206886722 +0100
-@@ -1,12 +1,12 @@
+diff -Naur spyder-3.3.1.orig/scripts/spyder.desktop spyder-3.3.1/scripts/spyder.desktop
+--- spyder-3.3.1.orig/scripts/spyder.desktop	2018-08-11 23:31:15.000000000 +0200
++++ spyder-3.3.1/scripts/spyder.desktop	2018-08-12 00:36:03.890345817 +0200
+@@ -1,12 +1,11 @@
  [Desktop Entry]
  Type=Application
  Version=1.0
 -Name=Spyder
-+Name=Spyder for Python 2.x
- GenericName=Spyder
--Comment=Scientific PYthon Development EnviRonment
+-GenericName=Spyder
+-Comment=The Scientific Python Development Environment
 -Icon=spyder
 -TryExec=spyder
 -Exec=spyder %F
-+Comment=Scientific PYthon Development EnviRonment - Python 2.x
++Name=Spyder for Python 2.x
++Comment=The Scientific Python Development Environment - Python 2
 +Icon=spyder2
 +TryExec=spyder2
 +Exec=spyder2 %F
@@ -34,10 +32,10 @@
  Terminal=false
  MimeType=text/x-python;
  Categories=Development;Science;IDE;Qt;
-diff -Naur spyder-3.2.7.orig/setup.py spyder-3.2.7/setup.py
---- spyder-3.2.7.orig/setup.py	2018-02-25 17:17:21.000000000 +0100
-+++ spyder-3.2.7/setup.py	2018-03-03 20:16:54.951582263 +0100
-@@ -82,8 +82,8 @@
+diff -Naur spyder-3.3.1.orig/setup.py spyder-3.3.1/setup.py
+--- spyder-3.3.1.orig/setup.py	2018-08-11 23:31:15.000000000 +0200
++++ spyder-3.3.1/setup.py	2018-08-12 00:37:27.851154407 +0200
+@@ -88,8 +88,8 @@
                            ('share/icons', ['img_src/spyder3.png']),
                            ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
          else: