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

[Fabio Castelli]

    Date: Saturday, March 3, 2018 @ 19:23:55
  Author: muflone
Revision: 302256

upgpkg: spyder 3.2.7-1

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

-------------------------+
 PKGBUILD                |   10 +++++++---
 bug_51437_spyder2.patch |   43 +++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-03 19:05:44 UTC (rev 302255)
+++ PKGBUILD	2018-03-03 19:23:55 UTC (rev 302256)
@@ -5,7 +5,7 @@
 
 pkgbase='spyder'
 pkgname=('spyder2' 'spyder3')
-pkgver=3.2.6
+pkgver=3.2.7
 pkgrel=1
 pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
 makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx')
@@ -17,17 +17,19 @@
         "bug_53489_python2-optional-nbconvert.patch"
         "bug_54508_missing_pyqt4_qtwebkit.patch"
         "bug_51437_spyder2.patch")
-sha256sums=('119546359c00574619bb26cba0c10697dfb7bdf1e539fdde7f5e2d7fdb7d56f3'
+sha256sums=('5e53705179b57680796b9c095556d30fdfe41b359bbcffea94a6ea1929b0d6dd'
             '84b8d5e9640d5d347ac4564130f217368cc3f823de30b458d467a05e60bbc8da'
             '7486faba90da062ef8da6912bfabd22b59343b1275758f04e4a41df2b3b8eec0'
             '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5'
-            'ae077fc95bc6861402a90c55bc11b3a2dda3fde4005e9d7ad65df3b1a120d8c1')
+            '4773c1b88816e696d7238cc7a1881dc5e954bbab633455af15fcbebcc3923745')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
   # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
+  msg2 "Applying patches bug_54508_missing_pyqt4_qtwebkit.patch"
   patch -p1 -i "../bug_54508_missing_pyqt4_qtwebkit.patch"
   # Replace spyder with spyder2 (see https://bugs.archlinux.org/task/51437)
+  msg2 "Applying patches bug_51437_spyder2.patch"
   patch -p1 -i "../bug_51437_spyder2.patch"
   mv "img_src/spyder.png" "img_src/spyder2.png"
   mv "scripts/spyder.desktop" "scripts/spyder2.desktop"
@@ -35,7 +37,9 @@
   # Prepare sources for spyder2 build
   cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder2-${pkgver}"
   cd "${srcdir}/spyder2-${pkgver}"
+  msg2 "Applying patches python2.patch"
   patch -p1 -i "../python2.patch"
+  msg2 "Applying patches bug_53489_python2-optional-nbconvert.patch"
   patch -p1 -i "../bug_53489_python2-optional-nbconvert.patch"
 
   # Prepare sources for spyder3 build

Modified: bug_51437_spyder2.patch
===================================================================
--- bug_51437_spyder2.patch	2018-03-03 19:05:44 UTC (rev 302255)
+++ bug_51437_spyder2.patch	2018-03-03 19:23:55 UTC (rev 302256)
@@ -1,51 +1,50 @@
-diff -Naur spyder-3.1.4.orig/scripts/spyder3.desktop spyder-3.1.4/scripts/spyder3.desktop
---- spyder-3.1.4.orig/scripts/spyder3.desktop	2017-04-24 02:30:23.000000000 +0200
-+++ spyder-3.1.4/scripts/spyder3.desktop	2017-08-12 20:49:55.349203674 +0200
+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 @@
  [Desktop Entry]
+ Type=Application
  Version=1.0
- Type=Application
 -Name=Spyder3
 -GenericName=Spyder3
 -Comment=Scientific PYthon Development EnviRonment - Python3
 +Name=Spyder for Python 3.x
 +Comment=Scientific PYthon Development EnviRonment - Python 3.x
+ Icon=spyder3
  TryExec=spyder3
  Exec=spyder3 %F
- Categories=Development;Science;IDE;Qt;
-diff -Naur spyder-3.1.4.orig/scripts/spyder.desktop spyder-3.1.4/scripts/spyder.desktop
---- spyder-3.1.4.orig/scripts/spyder.desktop	2017-04-24 02:30:23.000000000 +0200
-+++ spyder-3.1.4/scripts/spyder.desktop	2017-08-12 20:49:54.005881501 +0200
-@@ -1,13 +1,12 @@
+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 @@
  [Desktop Entry]
+ Type=Application
  Version=1.0
- Type=Application
 -Name=Spyder
--GenericName=Spyder
++Name=Spyder for Python 2.x
+ GenericName=Spyder
 -Comment=Scientific PYthon Development EnviRonment
+-Icon=spyder
 -TryExec=spyder
 -Exec=spyder %F
-+Name=Spyder for Python 2.x
 +Comment=Scientific PYthon Development EnviRonment - Python 2.x
++Icon=spyder2
 +TryExec=spyder2
 +Exec=spyder2 %F
- Categories=Development;Science;IDE;Qt;
--Icon=spyder
-+Icon=spyder2
  Terminal=false
- StartupNotify=true
  MimeType=text/x-python;
-diff -Naur spyder-3.1.4.orig/setup.py spyder-3.1.4/setup.py
---- spyder-3.1.4.orig/setup.py	2017-04-24 02:30:23.000000000 +0200
-+++ spyder-3.1.4/setup.py	2017-08-12 20:34:09.464160097 +0200
+ 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 @@
-                           ('share/pixmaps', ['img_src/spyder3.png']),
+                           ('share/icons', ['img_src/spyder3.png']),
                            ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
          else:
 -            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/pixmaps', ['img_src/spyder.png'])]
+-                          ('share/icons', ['img_src/spyder.png'])]
 +            data_files = [('share/applications', ['scripts/spyder2.desktop']),
-+                          ('share/pixmaps', ['img_src/spyder2.png'])]
++                          ('share/icons', ['img_src/spyder2.png'])]
      elif os.name == 'nt':
          data_files = [('scripts', ['img_src/spyder.ico',
                                     'img_src/spyder_reset.ico'])]