From 67bf8d053fbd4fcacb00d8b2ca22e49bd4b8623a Mon Sep 17 00:00:00 2001 From: XavierCLL Date: Sat, 5 Dec 2020 10:45:43 -0800 Subject: [PATCH] Enable speedup debugging again, others adjustments and fixes --- .SRCINFO | 8 ++-- PKGBUILD | 73 +++++++++++++++++------------------- charm.desktop | 2 +- pycharm-professional.desktop | 2 +- 4 files changed, 41 insertions(+), 44 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e639072..d87bb10 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,12 @@ pkgbase = pycharm-professional pkgdesc = Python IDE for Professional Developers. Professional Edition pkgver = 2020.3 - pkgrel = 2 + pkgrel = 3 url = https://www.jetbrains.com/pycharm/ arch = x86_64 license = custom makedepends = python-setuptools + makedepends = cython depends = giflib depends = glibc depends = sh @@ -31,7 +32,6 @@ pkgbase = pycharm-professional optdepends = python2-tox: Python environments for testing tool with Python 2 optdepends = python-tox: Python environments for testing tool with Python 3 optdepends = jupyter: For support Jupyter Notebook - optdepends = python-docutils-stubs: For build documentation with sphynx provides = pycharm conflicts = pycharm conflicts = pycharm-community-edition @@ -43,8 +43,8 @@ pkgbase = pycharm-professional source = charm.desktop source = charm sha256sums = a099d0aefa9e6a2e8507e0f89feb48f5839f529f21649393e22f52f641f2efcf - sha256sums = aaf7113e8c56e4d977eca204d57350d9493eda2710abefd2488a2b5d47c53344 - sha256sums = b026ef96831448be743f86e7e44bfa676629e8c3eb418c893fd87515c06263a7 + sha256sums = 4547368ae3af428bb6c18edad0cb11e2578b28512b7bf1ab9513c154dd24a0a3 + sha256sums = f8b5390d334de089ee6d1d87a0cfd8e502aa897f10361ba31a7ebc3f3cac3270 sha256sums = e3b2e7996a7571d659b9477f950ea935e8088c302f6d1e1f6cb5d803f1d10113 pkgname = pycharm-professional diff --git a/PKGBUILD b/PKGBUILD index 6242a30..a4e98dd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,29 +2,26 @@ pkgname=pycharm-professional pkgver=2020.3 -pkgrel=2 +pkgrel=3 pkgdesc="Python IDE for Professional Developers. Professional Edition" arch=('x86_64') url='https://www.jetbrains.com/pycharm/' conflicts=('pycharm' 'pycharm-community-edition') provides=('pycharm') license=('custom') -backup=( - "opt/$pkgname/bin/pycharm.vmoptions" - "opt/$pkgname/bin/pycharm64.vmoptions" - "opt/$pkgname/bin/idea.properties" -) +backup=("opt/$pkgname/bin/pycharm.vmoptions" + "opt/$pkgname/bin/pycharm64.vmoptions" + "opt/$pkgname/bin/idea.properties") depends=('giflib' 'glibc' 'sh' 'libxtst' 'libxslt' 'python' 'libdbusmenu-glib') source=("https://download.jetbrains.com/python/$pkgname-$pkgver.tar.gz" "pycharm-professional.desktop" "charm.desktop" "charm") -# https://download.jetbrains.com/python/pycharm-professional-${pkgver}.tar.gz.sha256 sha256sums=('a099d0aefa9e6a2e8507e0f89feb48f5839f529f21649393e22f52f641f2efcf' - 'aaf7113e8c56e4d977eca204d57350d9493eda2710abefd2488a2b5d47c53344' - 'b026ef96831448be743f86e7e44bfa676629e8c3eb418c893fd87515c06263a7' + '4547368ae3af428bb6c18edad0cb11e2578b28512b7bf1ab9513c154dd24a0a3' + 'f8b5390d334de089ee6d1d87a0cfd8e502aa897f10361ba31a7ebc3f3cac3270' 'e3b2e7996a7571d659b9477f950ea935e8088c302f6d1e1f6cb5d803f1d10113') -makedepends=('python-setuptools') +makedepends=('python-setuptools' 'cython') optdepends=('python2: Python 2 support' 'ipython2: For enhanced interactive Python shell v2 inside Pycharm' 'ipython: For enhanced interactive Python shell v3 inside Pycharm' @@ -42,38 +39,38 @@ optdepends=('python2: Python 2 support' 'python-pytest: For support testing inside Pycharm with Python 3' 'python2-tox: Python environments for testing tool with Python 2' 'python-tox: Python environments for testing tool with Python 3' - 'jupyter: For support Jupyter Notebook' - 'python-docutils-stubs: For build documentation with sphynx') + 'jupyter: For support Jupyter Notebook') build() { - cd "pycharm-$pkgver" - - # compile PyDev debugger used by PyCharm to speedup debugging - #python plugins/python/helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib . - - rm -r bin/fsnotifier lib/pty4j-native/linux/{x86,ppc64le} + # compile PyDev debugger used by PyCharm to speedup debugging + find pycharm-${pkgver}/plugins/python/helpers/pydev/ \( -name *.c -o -name *.so -o -name *.pyd \) -delete + sed -i '1s/^/# cython: language_level=3\n/' pycharm-${pkgver}/plugins/python/helpers/pydev/_pydevd_bundle/pydevd_cython.pxd + python pycharm-${pkgver}/plugins/python/helpers/pydev/setup_cython.py build_ext --inplace --force-cython + rm -rf pycharm-${pkgver}/plugins/python/helpers/pydev/build/ + find pycharm-${pkgver}/plugins/python/helpers/pydev/ -name __pycache__ -exec rm -rf {} \; + + rm -r pycharm-${pkgver}/lib/pty4j-native/linux/{mips64el,ppc64le,aarch64} } package() { - # workaround FS#40934 - sed -i "s/lcd/on/" "pycharm-$pkgver/bin/"*.vmoptions + # workaround FS#40934 + sed -i "s/lcd/on/" "pycharm-$pkgver/bin/"*.vmoptions + + # licenses + install -dm 755 "$pkgdir/usr/share/licenses/$pkgname/" + mv "pycharm-$pkgver/license/"* "$pkgdir/usr/share/licenses/$pkgname/" + + # base + install -dm 755 "$pkgdir/opt/$pkgname" + mv "pycharm-$pkgver/"* "$pkgdir/opt/$pkgname/" + install -dm 755 "$pkgdir/usr/share/applications" + install -Dm 644 "$pkgname.desktop" "$pkgdir/usr/share/applications/" - # base - install -dm 755 "$pkgdir/opt/$pkgname" - cp -dr --no-preserve=ownership "pycharm-$pkgver/"* "$pkgdir/opt/$pkgname/" - install -dm 755 "$pkgdir/usr/share/"{applications,pixmaps} - install -Dm 644 "$pkgdir/opt/$pkgname/bin/pycharm.png" "$pkgdir/usr/share/pixmaps/pycharm.png" - install -Dm 644 pycharm-professional.desktop "$pkgdir/usr/share/applications/" - - # exec - install -dm 755 "$pkgdir/usr/bin/" - ln -s /opt/pycharm-professional/bin/pycharm.sh "$pkgdir/usr/bin/pycharm" - - # licenses - install -dm 755 "$pkgdir/usr/share/licenses/$pkgname/" - cp -dr --no-preserve=ownership "pycharm-$pkgver/license/"* "$pkgdir/usr/share/licenses/$pkgname/" - - # install charm application - for edit a single file in Pycharm - install -Dm 755 charm "$pkgdir/usr/bin/" - install -Dm 644 charm.desktop "$pkgdir/usr/share/applications/" + # exec + install -dm 755 "$pkgdir/usr/bin/" + ln -s "/opt/$pkgname/bin/pycharm.sh" "$pkgdir/usr/bin/pycharm" + + # install charm application - for edit a single file in Pycharm + install -Dm 755 charm "$pkgdir/usr/bin/" + install -Dm 644 charm.desktop "$pkgdir/usr/share/applications/" } diff --git a/charm.desktop b/charm.desktop index fe7613f..d3c5c22 100644 --- a/charm.desktop +++ b/charm.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Charm -Icon=pycharm +Icon=/opt/pycharm-professional/bin/pycharm.svg Exec=/usr/bin/charm %f MimeType=text/x-python;application/x-ipynb+json NoDisplay=true diff --git a/pycharm-professional.desktop b/pycharm-professional.desktop index 29a3ee0..3ab9b50 100644 --- a/pycharm-professional.desktop +++ b/pycharm-professional.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=PyCharm Professional Edition -Icon=pycharm +Icon=/opt/pycharm-professional/bin/pycharm.svg Comment=Python IDE for Professional Developers. Exec=/usr/bin/pycharm %f Terminal=false