Date: Thursday, September 29, 2022 @ 12:06:11
Author: artafinde
Revision: 1316058
upgpkg: pycharm-community-edition 2022.2.2-2
FS#76037 switch to {jdk,jre}17-openjdk
Modified:
pycharm-community-edition/trunk/PKGBUILD
pycharm-community-edition/trunk/pycharm.sh
------------+
PKGBUILD | 18 ++++++++----------
pycharm.sh | 7 ++-----
2 files changed, 10 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-29 12:04:52 UTC (rev 1316057)
+++ PKGBUILD 2022-09-29 12:06:11 UTC (rev 1316058)
@@ -7,7 +7,9 @@
pkgname=pycharm-community-edition
pkgver=2022.2.2
_build=222.4167.33
-pkgrel=1
+_jrever=17
+_jdkver=17
+pkgrel=2
pkgdesc='Python IDE for Professional Developers'
arch=(x86_64)
url=https://www.jetbrains.com/pycharm/
@@ -15,8 +17,7 @@
depends=(
giflib
glib2
- java-environment=11
- java11-openjfx
+ "jre${_jrever}-openjdk"
python
sh
ttf-font
@@ -28,7 +29,7 @@
)
makedepends=(
git
- java-environment=11
+ "jdk${_jdkver}-openjdk"
python-setuptools
)
source=(
@@ -40,7 +41,7 @@
sha256sums=('SKIP'
'SKIP'
'f727119ec7c8b96820e80712b1ee342de6a94ff72402e8f2d390cbff702f9b21'
- '7b5360b4977e934931acab775d04915417a5da9f3ea1dd44355525b0016cf65d')
+ 'f4c4f1dfac7fa89ac1ea407904b19d0513d481b2f6f562672d02bfa4ce32c1ff')
prepare() {
cd intellij-community
@@ -62,11 +63,8 @@
build() {
cd intellij-community
- unset _JAVA_OPTIONS
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
- export PATH="${JAVA_HOME}/bin:${PATH}"
- export JDK_16_x64=/usr/lib/jvm/java-11-openjdk
- export JDK_18_x64=/usr/lib/jvm/java-11-openjdk
+ export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
+ export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
export MAVEN_REPOSITORY=/build/.m2/repository
./python/installers.cmd -Dintellij.build.use.compiled.classes=false
-Dintellij.build.target.os=linux
Modified: pycharm.sh
===================================================================
--- pycharm.sh 2022-09-29 12:04:52 UTC (rev 1316057)
+++ pycharm.sh 2022-09-29 12:06:11 UTC (rev 1316058)
@@ -1,14 +1,11 @@
#!/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/"
+ PYCHARM_JDK="/usr/lib/jvm/java-17-openjdk/"
fi
# open-jfx location that should match the JDK version
if [ -z "$PYCHARM_JFX" ] ; then
- PYCHARM_JFX="/usr/lib/jvm/java-11-openjfx/"
+ PYCHARM_JFX="/usr/lib/jvm/java-17-openjfx/"
fi
# classpath according to defined JDK/JFX
if [ -z "$PYCHARM_CLASSPATH" ] ; then
