[arch-commits] Commit in pycharm-community-edition/trunk (PKGBUILD pycharm.sh)

[Levente Polyak]

    Date: Monday, July 20, 2020 @ 07:35:04
  Author: anthraxx
Revision: 664615

upgpkg: pycharm-community-edition 2020.1.3-1

Modified:
  pycharm-community-edition/trunk/PKGBUILD
  pycharm-community-edition/trunk/pycharm.sh

------------+
 PKGBUILD   |   10 ++++++----
 pycharm.sh |   15 +++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-20 05:59:11 UTC (rev 664614)
+++ PKGBUILD	2020-07-20 07:35:04 UTC (rev 664615)
@@ -3,9 +3,9 @@
 # Contributor: David Keogh <davekeogh at archlinux.us>
 
 pkgname=pycharm-community-edition
-pkgver=2020.1.2
-_build=201.7846.77
-_gitcommit=47bc792f3b88d030aeabd4d00b0d757100a35289
+pkgver=2020.1.3
+_build=201.8538.36
+_gitcommit=3e0e8f91ced043195717b296b09e008802b2f6aa
 pkgrel=1
 pkgdesc='Python IDE for Professional Developers'
 arch=(x86_64)
@@ -15,9 +15,11 @@
   giflib
   glib2
   java-runtime=11
+  java11-openjfx
   python
   sh
   ttf-font
+  libdbusmenu-glib
 )
 optdepends=(
   'ipython2: IPython integration for Python 2'
@@ -39,7 +41,7 @@
 )
 sha256sums=('SKIP'
             'f727119ec7c8b96820e80712b1ee342de6a94ff72402e8f2d390cbff702f9b21'
-            '8c1328ab5693a21fc49447d6aab979bf01cc6e2f592071b0ccbeba64cf6bd2d5')
+            '7b5360b4977e934931acab775d04915417a5da9f3ea1dd44355525b0016cf65d')
 
 prepare() {
   cd intellij-community

Modified: pycharm.sh
===================================================================
--- pycharm.sh	2020-07-20 05:59:11 UTC (rev 664614)
+++ pycharm.sh	2020-07-20 07:35:04 UTC (rev 664615)
@@ -1,9 +1,20 @@
 #!/bin/sh
 
+# WARNING:
+# Running IntelliJ PYCHARM with java other than java 11
+# may cause various problems, such as Graddle import not working
 if [ -z "$PYCHARM_JDK" ] ; then
   PYCHARM_JDK="/usr/lib/jvm/java-11-openjdk/"
 fi
-exec env PYCHARM_JDK="$PYCHARM_JDK" /usr/share/pycharm/bin/pycharm.sh "$@"
+# open-jfx location that should match the JDK version
+if [ -z "$PYCHARM_JFX" ] ; then
+  PYCHARM_JFX="/usr/lib/jvm/java-11-openjfx/"
+fi
+# classpath according to defined JDK/JFX
+if [ -z "$PYCHARM_CLASSPATH" ] ; then
+  PYCHARM_CLASSPATH="${PYCHARM_JDK}/lib/*:${PYCHARM_JFX}/lib/*"
+fi
 
+exec env PYCHARM_JDK="$PYCHARM_JDK" PYCHARM_CLASSPATH="$PYCHARM_CLASSPATH" /usr/share/pycharm/bin/pycharm.sh "$@"
+
 # vim: ts=2 sw=2 et:
-