summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@riseup.net>2020-03-19 13:05:53 +0100
committerJoonas Niilola <juippis@gentoo.org>2020-03-27 18:25:01 +0200
commita6cbb36f25dd2442c420f32d2893ec3206bbd510 (patch)
tree6698a891c7d619c79fc496e86b470f73092c65eb /dev-python/spyder/files
parentdev-python/spyder-kernels: version bump 1.9.0 (diff)
downloadgentoo-a6cbb36f25dd2442c420f32d2893ec3206bbd510.tar.gz
gentoo-a6cbb36f25dd2442c420f32d2893ec3206bbd510.tar.bz2
gentoo-a6cbb36f25dd2442c420f32d2893ec3206bbd510.zip
dev-python/spyder: version bump 4.1.1
Bug: https://bugs.gentoo.org/714760 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net> Closes: https://github.com/gentoo/gentoo/pull/15012 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-python/spyder/files')
-rw-r--r--dev-python/spyder/files/spyder-4.1.1-build.patch (renamed from dev-python/spyder/files/spyder-4.0.1-build.patch)0
-rw-r--r--dev-python/spyder/files/spyder-4.1.1-py3-only.patch (renamed from dev-python/spyder/files/spyder-4.0.1-py3-only.patch)17
2 files changed, 8 insertions, 9 deletions
diff --git a/dev-python/spyder/files/spyder-4.0.1-build.patch b/dev-python/spyder/files/spyder-4.1.1-build.patch
index 7463550fc165..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.0.1-build.patch
+++ b/dev-python/spyder/files/spyder-4.1.1-build.patch
diff --git a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
index df5f0c4ad1c6..afdc92a1e122 100644
--- a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
+++ b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
@@ -1,5 +1,5 @@
diff --git a/setup.py b/setup.py
-index a492549..b77f758 100644
+index 2d5d58b..4adc952 100644
--- a/setup.py
+++ b/setup.py
@@ -31,13 +31,6 @@ import shutil
@@ -28,23 +28,22 @@ index a492549..b77f758 100644
- data_files = [('share/applications', ['scripts/spyder.desktop']),
- ('share/icons', ['img_src/spyder.png'])]
+ data_files = [('share/applications', ['scripts/spyder.desktop']),
-+ ('share/pixmaps', ['img_src/spyder.png'])]
++ ('share/icons', ['img_src/spyder.png'])]
elif os.name == 'nt':
data_files = [('scripts', ['img_src/spyder.ico',
'img_src/spyder_reset.ico'])]
-@@ -115,10 +103,7 @@ def get_packages():
- # platforms due to a bug in pip installation process
+@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
# See spyder-ide/spyder#1158.
SCRIPTS = ['%s_win_post_install.py' % NAME]
+
-if PY3 and sys.platform.startswith('linux'):
- SCRIPTS.append('spyder3')
-else:
-- SCRIPTS.append('spyder')
-+SCRIPTS.append('spyder')
-
++if sys.platform.startswith('linux'):
+ SCRIPTS.append('spyder')
- #==============================================================================
-@@ -246,8 +231,7 @@ if 'setuptools' in sys.modules:
+ if os.name == 'nt':
+@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
setup_args['entry_points'] = {
'gui_scripts': [