[arch-commits] Commit in spyder/repos/community-any (12 files)

Fabio Castelli muflone at archlinux.org
Fri Apr 26 11:36:22 UTC 2019


    Date: Friday, April 26, 2019 @ 11:36:22
  Author: muflone
Revision: 454214

archrelease: copy trunk to community-any

Added:
  spyder/repos/community-any/PKGBUILD
    (from rev 454213, spyder/trunk/PKGBUILD)
  spyder/repos/community-any/bug_51437_spyder2.patch
    (from rev 454213, spyder/trunk/bug_51437_spyder2.patch)
  spyder/repos/community-any/bug_53489_python2-optional-nbconvert.patch
    (from rev 454213, spyder/trunk/bug_53489_python2-optional-nbconvert.patch)
  spyder/repos/community-any/bug_54508_missing_pyqt4_qtwebkit.patch
    (from rev 454213, spyder/trunk/bug_54508_missing_pyqt4_qtwebkit.patch)
  spyder/repos/community-any/python2.patch
    (from rev 454213, spyder/trunk/python2.patch)
  spyder/repos/community-any/spyder2.install
    (from rev 454213, spyder/trunk/spyder2.install)
Deleted:
  spyder/repos/community-any/PKGBUILD
  spyder/repos/community-any/bug_51437_spyder2.patch
  spyder/repos/community-any/bug_53489_python2-optional-nbconvert.patch
  spyder/repos/community-any/bug_54508_missing_pyqt4_qtwebkit.patch
  spyder/repos/community-any/python2.patch
  spyder/repos/community-any/spyder2.install

--------------------------------------------+
 PKGBUILD                                   |  225 +++++++++++++--------------
 bug_51437_spyder2.patch                    |   96 +++++------
 bug_53489_python2-optional-nbconvert.patch |   24 +-
 bug_54508_missing_pyqt4_qtwebkit.patch     |   48 ++---
 python2.patch                              |   34 ++--
 spyder2.install                            |   16 -
 6 files changed, 221 insertions(+), 222 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-26 11:35:52 UTC (rev 454213)
+++ PKGBUILD	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Francois Boulogne <fboulogne at april.org>
-# Contributor: TDY <tdy at gmx.com>
-
-pkgbase='spyder'
-pkgname=('spyder2' 'spyder3')
-pkgver=3.3.1
-pkgrel=1
-pkgdesc='The Scientific Python Development Environment'
-makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx'
-             'desktop-file-utils')
-arch=('any')
-url='https://www.spyder-ide.org/'
-license=('MIT')
-source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz"
-        "python2.patch"
-        "bug_53489_python2-optional-nbconvert.patch"
-        "bug_54508_missing_pyqt4_qtwebkit.patch"
-        "bug_51437_spyder2.patch")
-sha256sums=('a28c9eb919389739432d7243b533beb5973ed8415b3f00de894a6a15552a0b5d'
-            '84b8d5e9640d5d347ac4564130f217368cc3f823de30b458d467a05e60bbc8da'
-            '7486faba90da062ef8da6912bfabd22b59343b1275758f04e4a41df2b3b8eec0'
-            '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5'
-            'bc94729fcf378ff1fa4ed028c4f3092acab1a098f608a121af5f8801772c28a0')
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-  # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
-  echo "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)
-  echo "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"
-
-  # Prepare sources for spyder2 build
-  cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder2-${pkgver}"
-  cd "${srcdir}/spyder2-${pkgver}"
-  echo "Applying patches python2.patch"
-  patch -p1 -i "../python2.patch"
-  echo "Applying patches bug_53489_python2-optional-nbconvert.patch"
-  patch -p1 -i "../bug_53489_python2-optional-nbconvert.patch"
-
-  # Prepare sources for spyder3 build
-  cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder3-${pkgver}"
-}
-
-build() {
-  cd "${srcdir}/spyder2-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/spyder3-${pkgver}"
-  python3 setup.py build
-}
-
-package_spyder2() {
-  pkgdesc='The Scientific Python Development Environment (Python 2 version)'
-  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<1.0' 'icu' 'gtk-update-icon-cache'
-           'desktop-file-utils')
-  provides=('spyder')
-  conflicts=('spyder')
-  replaces=('spyder')
-  optdepends=('python2-numpy: N-dimensional arrays'
-              'python2-scipy: signal/image processing'
-              'python2-h5py: HDF5 support'
-              'python2-matplotlib: interactive 2D/3D data plotting'
-              'python2-sympy: symbolic mathematics for the IPython console'
-              'python2-pandas: view and edit DataFrames and Series in the Variable Explorer')
-  install="${pkgname}.install"
-
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  # Install license file
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  # Install icon and desktop file
-  install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-  # Change main executable name
-  mv "${pkgdir}/usr/bin/spyder" "${pkgdir}/usr/bin/${pkgname}"
-  # Remove useless spyder_win_post_install script
-  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
-}
-
-package_spyder3() {
-  pkgdesc='The Scientific Python Development Environment (Python 3 version)'
-  depends=('python-pyqt5' 'qt5-webkit' 'python-qtconsole' 'python-qtpy' 'python-qtawesome'
-           '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<1.0' 'icu' 'gtk-update-icon-cache'
-           'desktop-file-utils')
-  optdepends=('python-numpy: N-dimensional arrays'
-              'python-scipy: signal/image processing'
-              'python-h5py: HDF5 support'
-              'python-matplotlib: interactive 2D/3D data plotting'
-              'python-sympy: symbolic mathematics for the IPython console'
-              'python-pandas: view and edit DataFrames and Series in the Variable Explorer')
-
-  cd "${pkgname}-${pkgver}"
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  # Install license file
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  # Install icon and desktop file
-  install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-  # Remove useless spyder_win_post_install script
-  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
-  # Add symlink /usr/bin/spyder to /usr/bin/spyder3 (see https://bugs.archlinux.org/task/51437)
-  ln -s "/usr/bin/spyder3" "${pkgdir}/usr/bin/spyder"
-}

Copied: spyder/repos/community-any/PKGBUILD (from rev 454213, spyder/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-26 11:36:22 UTC (rev 454214)
@@ -0,0 +1,112 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Francois Boulogne <fboulogne at april.org>
+# Contributor: TDY <tdy at gmx.com>
+
+pkgbase='spyder'
+pkgname=('spyder2' 'spyder3')
+pkgver=3.3.4
+pkgrel=1
+pkgdesc='The Scientific Python Development Environment'
+makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx'
+             'desktop-file-utils')
+arch=('any')
+url='https://www.spyder-ide.org/'
+license=('MIT')
+source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz"
+        "python2.patch"
+        "bug_53489_python2-optional-nbconvert.patch"
+        "bug_54508_missing_pyqt4_qtwebkit.patch"
+        "bug_51437_spyder2.patch")
+sha256sums=('7441c267076251cdb9c205cbd1a25155be5686ff2c2192bd522650c057a6c92a'
+            '84b8d5e9640d5d347ac4564130f217368cc3f823de30b458d467a05e60bbc8da'
+            '7486faba90da062ef8da6912bfabd22b59343b1275758f04e4a41df2b3b8eec0'
+            '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5'
+            'bc94729fcf378ff1fa4ed028c4f3092acab1a098f608a121af5f8801772c28a0')
+
+prepare() {
+  cd "${pkgbase}-${pkgver}"
+  # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508)
+  echo "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)
+  echo "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"
+
+  # Prepare sources for spyder2 build
+  cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder2-${pkgver}"
+  cd "${srcdir}/spyder2-${pkgver}"
+  echo "Applying patches python2.patch"
+  patch -p1 -i "../python2.patch"
+  echo "Applying patches bug_53489_python2-optional-nbconvert.patch"
+  patch -p1 -i "../bug_53489_python2-optional-nbconvert.patch"
+
+  # Prepare sources for spyder3 build
+  cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder3-${pkgver}"
+}
+
+build() {
+  cd "${srcdir}/spyder2-${pkgver}"
+  python2 setup.py build
+
+  cd "${srcdir}/spyder3-${pkgver}"
+  python3 setup.py build
+}
+
+package_spyder2() {
+  pkgdesc='The Scientific Python Development Environment (Python 2 version)'
+  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<1.0' 'icu' 'gtk-update-icon-cache'
+           'desktop-file-utils')
+  provides=('spyder')
+  conflicts=('spyder')
+  replaces=('spyder')
+  optdepends=('python2-numpy: N-dimensional arrays'
+              'python2-scipy: signal/image processing'
+              'python2-h5py: HDF5 support'
+              'python2-matplotlib: interactive 2D/3D data plotting'
+              'python2-sympy: symbolic mathematics for the IPython console'
+              'python2-pandas: view and edit DataFrames and Series in the Variable Explorer')
+  install="${pkgname}.install"
+
+  cd "${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  # Install license file
+  install -D -m644 "LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  # Install icon and desktop file
+  install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+  # Change main executable name
+  mv "${pkgdir}/usr/bin/spyder" "${pkgdir}/usr/bin/${pkgname}"
+  # Remove useless spyder_win_post_install script
+  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
+}
+
+package_spyder3() {
+  pkgdesc='The Scientific Python Development Environment (Python 3 version)'
+  depends=('python-pyqt5' 'qt5-webkit' 'python-qtconsole' 'python-qtpy' 'python-qtawesome'
+           '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<1.0' 'icu' 'gtk-update-icon-cache'
+           'desktop-file-utils')
+  optdepends=('python-numpy: N-dimensional arrays'
+              'python-scipy: signal/image processing'
+              'python-h5py: HDF5 support'
+              'python-matplotlib: interactive 2D/3D data plotting'
+              'python-sympy: symbolic mathematics for the IPython console'
+              'python-pandas: view and edit DataFrames and Series in the Variable Explorer')
+
+  cd "${pkgname}-${pkgver}"
+  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  # Install license file
+  install -D -m644 "LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  # Install icon and desktop file
+  install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+  # Remove useless spyder_win_post_install script
+  rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py"
+  # Add symlink /usr/bin/spyder to /usr/bin/spyder3 (see https://bugs.archlinux.org/task/51437)
+  ln -s "/usr/bin/spyder3" "${pkgdir}/usr/bin/spyder"
+}

Deleted: bug_51437_spyder2.patch
===================================================================
--- bug_51437_spyder2.patch	2019-04-26 11:35:52 UTC (rev 454213)
+++ bug_51437_spyder2.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,48 +0,0 @@
-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
-+Name=Spyder for Python 3.x
- Comment=The Scientific Python Development Environment - Python 3
- Icon=spyder3
- TryExec=spyder3
-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
--GenericName=Spyder
--Comment=The Scientific Python Development Environment
--Icon=spyder
--TryExec=spyder
--Exec=spyder %F
-+Name=Spyder for Python 2.x
-+Comment=The Scientific Python Development Environment - Python 2
-+Icon=spyder2
-+TryExec=spyder2
-+Exec=spyder2 %F
- Terminal=false
- MimeType=text/x-python;
- Categories=Development;Science;IDE;Qt;
-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:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+            data_files = [('share/applications', ['scripts/spyder2.desktop']),
-+                          ('share/icons', ['img_src/spyder2.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]

Copied: spyder/repos/community-any/bug_51437_spyder2.patch (from rev 454213, spyder/trunk/bug_51437_spyder2.patch)
===================================================================
--- bug_51437_spyder2.patch	                        (rev 0)
+++ bug_51437_spyder2.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -0,0 +1,48 @@
+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
++Name=Spyder for Python 3.x
+ Comment=The Scientific Python Development Environment - Python 3
+ Icon=spyder3
+ TryExec=spyder3
+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
+-GenericName=Spyder
+-Comment=The Scientific Python Development Environment
+-Icon=spyder
+-TryExec=spyder
+-Exec=spyder %F
++Name=Spyder for Python 2.x
++Comment=The Scientific Python Development Environment - Python 2
++Icon=spyder2
++TryExec=spyder2
++Exec=spyder2 %F
+ Terminal=false
+ MimeType=text/x-python;
+ Categories=Development;Science;IDE;Qt;
+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:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/icons', ['img_src/spyder.png'])]
++            data_files = [('share/applications', ['scripts/spyder2.desktop']),
++                          ('share/icons', ['img_src/spyder2.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]

Deleted: bug_53489_python2-optional-nbconvert.patch
===================================================================
--- bug_53489_python2-optional-nbconvert.patch	2019-04-26 11:35:52 UTC (rev 454213)
+++ bug_53489_python2-optional-nbconvert.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,12 +0,0 @@
-diff -Naur spyder-3.2.0.orig/spyder/plugins/editor.py spyder-3.2.0/spyder/plugins/editor.py
---- spyder-3.2.0.orig/spyder/plugins/editor.py	2017-07-24 05:03:40.000000000 +0200
-+++ spyder-3.2.0/spyder/plugins/editor.py	2017-08-12 21:45:09.455757449 +0200
-@@ -56,7 +56,7 @@
- # Dependencies
- NBCONVERT_REQVER = ">=4.0"
- dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
--                 required_version=NBCONVERT_REQVER)
-+                 required_version=NBCONVERT_REQVER, optional=True)
- 
- 
- def _load_all_breakpoints():

Copied: spyder/repos/community-any/bug_53489_python2-optional-nbconvert.patch (from rev 454213, spyder/trunk/bug_53489_python2-optional-nbconvert.patch)
===================================================================
--- bug_53489_python2-optional-nbconvert.patch	                        (rev 0)
+++ bug_53489_python2-optional-nbconvert.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -0,0 +1,12 @@
+diff -Naur spyder-3.2.0.orig/spyder/plugins/editor.py spyder-3.2.0/spyder/plugins/editor.py
+--- spyder-3.2.0.orig/spyder/plugins/editor.py	2017-07-24 05:03:40.000000000 +0200
++++ spyder-3.2.0/spyder/plugins/editor.py	2017-08-12 21:45:09.455757449 +0200
+@@ -56,7 +56,7 @@
+ # Dependencies
+ NBCONVERT_REQVER = ">=4.0"
+ dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
+-                 required_version=NBCONVERT_REQVER)
++                 required_version=NBCONVERT_REQVER, optional=True)
+ 
+ 
+ def _load_all_breakpoints():

Deleted: bug_54508_missing_pyqt4_qtwebkit.patch
===================================================================
--- bug_54508_missing_pyqt4_qtwebkit.patch	2019-04-26 11:35:52 UTC (rev 454213)
+++ bug_54508_missing_pyqt4_qtwebkit.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,24 +0,0 @@
-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()

Copied: spyder/repos/community-any/bug_54508_missing_pyqt4_qtwebkit.patch (from rev 454213, spyder/trunk/bug_54508_missing_pyqt4_qtwebkit.patch)
===================================================================
--- bug_54508_missing_pyqt4_qtwebkit.patch	                        (rev 0)
+++ bug_54508_missing_pyqt4_qtwebkit.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -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()

Deleted: python2.patch
===================================================================
--- python2.patch	2019-04-26 11:35:52 UTC (rev 454213)
+++ python2.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,17 +0,0 @@
-diff -Naur spyder-3.2.0.orig/scripts/spyder spyder-3.2.0/scripts/spyder
---- spyder-3.2.0.orig/scripts/spyder	2017-07-24 05:03:40.000000000 +0200
-+++ spyder-3.2.0/scripts/spyder	2017-08-12 21:22:11.230212853 +0200
-@@ -1,3 +1,3 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from spyder.app import start
- start.main()
-diff -Naur spyder-3.2.0.orig/spyder/app/restart.py spyder-3.2.0/spyder/app/restart.py
---- spyder-3.2.0.orig/spyder/app/restart.py	2017-07-24 05:03:40.000000000 +0200
-+++ spyder-3.2.0/spyder/app/restart.py	2017-08-12 21:22:11.230212853 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # -*- coding: utf-8 -*-
- #
- # Copyright © Spyder Project Contributors

Copied: spyder/repos/community-any/python2.patch (from rev 454213, spyder/trunk/python2.patch)
===================================================================
--- python2.patch	                        (rev 0)
+++ python2.patch	2019-04-26 11:36:22 UTC (rev 454214)
@@ -0,0 +1,17 @@
+diff -Naur spyder-3.2.0.orig/scripts/spyder spyder-3.2.0/scripts/spyder
+--- spyder-3.2.0.orig/scripts/spyder	2017-07-24 05:03:40.000000000 +0200
++++ spyder-3.2.0/scripts/spyder	2017-08-12 21:22:11.230212853 +0200
+@@ -1,3 +1,3 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ from spyder.app import start
+ start.main()
+diff -Naur spyder-3.2.0.orig/spyder/app/restart.py spyder-3.2.0/spyder/app/restart.py
+--- spyder-3.2.0.orig/spyder/app/restart.py	2017-07-24 05:03:40.000000000 +0200
++++ spyder-3.2.0/spyder/app/restart.py	2017-08-12 21:22:11.230212853 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright © Spyder Project Contributors

Deleted: spyder2.install
===================================================================
--- spyder2.install	2019-04-26 11:35:52 UTC (rev 454213)
+++ spyder2.install	2019-04-26 11:36:22 UTC (rev 454214)
@@ -1,8 +0,0 @@
-post_install() {
-  echo "==> The /usr/bin/spyder executable is now a symlink for spyder3 (in the spyder3 package)."
-  echo "==> The executable file for spyder2 is now /usr/bin/spyder2"
-}
-
-post_upgrade() {
-  post_install
-}

Copied: spyder/repos/community-any/spyder2.install (from rev 454213, spyder/trunk/spyder2.install)
===================================================================
--- spyder2.install	                        (rev 0)
+++ spyder2.install	2019-04-26 11:36:22 UTC (rev 454214)
@@ -0,0 +1,8 @@
+post_install() {
+  echo "==> The /usr/bin/spyder executable is now a symlink for spyder3 (in the spyder3 package)."
+  echo "==> The executable file for spyder2 is now /usr/bin/spyder2"
+}
+
+post_upgrade() {
+  post_install
+}


More information about the arch-commits mailing list