From b9ceabc2a031f1a775a2f8e4166de68d7ca739d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Sun, 6 Nov 2022 06:01:13 +0100
Subject: [PATCH] python-spyder: update to 5.4.0

---
 mingw-w64-python-spyder/PKGBUILD              | 32 ++++++++-----------
 .../spyder-requirements-fix.patch             |  4 +--
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/mingw-w64-python-spyder/PKGBUILD b/mingw-w64-python-spyder/PKGBUILD
index a02b49723d..884ea5a794 100644
--- a/mingw-w64-python-spyder/PKGBUILD
+++ b/mingw-w64-python-spyder/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=spyder
 pkgbase=mingw-w64-python-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-python-${_realname}
-pkgver=5.3.3
+pkgver=5.4.0
 pkgrel=1
 pkgdesc='The Scientific Python Development Environment (mingw-w64)'
 arch=('any')
@@ -22,12 +22,8 @@ depends=(
     ${MINGW_PACKAGE_PREFIX}-python-jedi
     ${MINGW_PACKAGE_PREFIX}-python-jellyfish
     ${MINGW_PACKAGE_PREFIX}-python-jsonschema
-    ${MINGW_PACKAGE_PREFIX}-python-jupyter-nbconvert
-    ${MINGW_PACKAGE_PREFIX}-python-jupyter_client
-    ${MINGW_PACKAGE_PREFIX}-python-jupyter_core
     ${MINGW_PACKAGE_PREFIX}-python-keyring
-    ${MINGW_PACKAGE_PREFIX}-python-lsp-black
-    ${MINGW_PACKAGE_PREFIX}-python-lsp-server
+    ${MINGW_PACKAGE_PREFIX}-python-jupyter-nbconvert
     ${MINGW_PACKAGE_PREFIX}-python-numpydoc
     ${MINGW_PACKAGE_PREFIX}-python-paramiko
     ${MINGW_PACKAGE_PREFIX}-python-parso
@@ -36,22 +32,24 @@ depends=(
     ${MINGW_PACKAGE_PREFIX}-python-psutil
     ${MINGW_PACKAGE_PREFIX}-python-pygments
     ${MINGW_PACKAGE_PREFIX}-python-pylint
+    ${MINGW_PACKAGE_PREFIX}-python-pylint-venv
+    ${MINGW_PACKAGE_PREFIX}-python-lsp-black
     ${MINGW_PACKAGE_PREFIX}-python-pyls-spyder
     ${MINGW_PACKAGE_PREFIX}-python-pyqt5
+    ${MINGW_PACKAGE_PREFIX}-python-lsp-server
     ${MINGW_PACKAGE_PREFIX}-python-pyzmq
     ${MINGW_PACKAGE_PREFIX}-python-qdarkstyle
     ${MINGW_PACKAGE_PREFIX}-python-qstylizer
     ${MINGW_PACKAGE_PREFIX}-python-qtawesome
     ${MINGW_PACKAGE_PREFIX}-python-qtconsole
     ${MINGW_PACKAGE_PREFIX}-python-qtpy
-    ${MINGW_PACKAGE_PREFIX}-python-rope
     ${MINGW_PACKAGE_PREFIX}-python-rtree
+    ${MINGW_PACKAGE_PREFIX}-python-setuptools
     ${MINGW_PACKAGE_PREFIX}-python-sphinx
     ${MINGW_PACKAGE_PREFIX}-python-spyder-kernels
     ${MINGW_PACKAGE_PREFIX}-python-textdistance
     ${MINGW_PACKAGE_PREFIX}-python-three-merge
     ${MINGW_PACKAGE_PREFIX}-python-watchdog
-    ${MINGW_PACKAGE_PREFIX}-python-whatthepatch
     ${MINGW_PACKAGE_PREFIX}-qtwebkit
 )
 optdepends=(
@@ -62,17 +60,19 @@ optdepends=(
     ${MINGW_PACKAGE_PREFIX}-python-scipy
 )
 makedepends=(${MINGW_PACKAGE_PREFIX}-python-setuptools)
+options=(!strip)
 source=(https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz
         spyder-requirements-fix.patch)
-sha256sums=('bd68709f4ef38075fbffbb80cf47a43709c088a2c408207306ae3b4ed4da1df1'
-            '1194e442a08bc0ed61898d0edabacc69da46ac984b6eb6a4028e1bd24b5727fe')
+sha256sums=('9d9fabc39a802d276efa76da02d180ecf2d6e978dc8de66fb8f7786b95ad664c'
+            '081bce38b79695e213db58bf4bcacf704e81ce5f8f2a1beaf78ce0b5f50bb734')
 
 prepare() {
+  cd "${_realname}-${pkgver}"
+  patch -p1 -i ${srcdir}/spyder-requirements-fix.patch
+
+  cd "${srcdir}"
   rm -rf python-build-${MSYSTEM} | true
   cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
-
-  cd "python-build-${MSYSTEM}"
-  patch -p1 -i ${srcdir}/spyder-requirements-fix.patch
 }
 
 build() {
@@ -87,9 +87,5 @@ package() {
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
-
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py*; do
-    sed -e '1 { s|^#!.*$|#!/usr/bin/env pythonw.exe|g }' -i ${_f}
-  done
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-spyder/spyder-requirements-fix.patch b/mingw-w64-python-spyder/spyder-requirements-fix.patch
index 89e3ab085f..085d4126ec 100644
--- a/mingw-w64-python-spyder/spyder-requirements-fix.patch
+++ b/mingw-w64-python-spyder/spyder-requirements-fix.patch
@@ -9,11 +9,11 @@
                                     'img_src/spyder_reset.ico'])]
      else:
          data_files = []
-@@ -227,7 +227,6 @@
+@@ -228,7 +228,6 @@
      'python-lsp-black>=1.2.0',
      'pyls-spyder>=0.4.0',
      'pyqt5<5.16',
 -    'pyqtwebengine<5.16',
-     'python-lsp-server[all]>=1.5.0,<1.6.0',
+     'python-lsp-server[all]>=1.6.0,<1.7.0',
      'pyxdg>=0.26;platform_system=="Linux"',
      'pyzmq>=22.1.0',