Date: Thursday, September 29, 2022 @ 12:04:44
Author: artafinde
Revision: 1316056
upgpkg: intellij-idea-community-edition 4:2022.2.2-2
FS#76037 switch to {jdk,jre}17-openjdk
clean-up leftover patch
Modified:
intellij-idea-community-edition/trunk/PKGBUILD
intellij-idea-community-edition/trunk/idea.sh
Deleted:
intellij-idea-community-edition/trunk/skip_jps_build.patch
----------------------+
PKGBUILD | 19 ++++++++++---------
idea.sh | 7 ++-----
skip_jps_build.patch | 25 -------------------------
3 files changed, 12 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-29 11:57:10 UTC (rev 1316055)
+++ PKGBUILD 2022-09-29 12:04:44 UTC (rev 1316056)
@@ -6,7 +6,9 @@
pkgname=intellij-idea-community-edition
pkgver=2022.2.2
_build=222.4167.29
-pkgrel=1
+_jrever=17
+_jdkver=17
+pkgrel=2
epoch=4
pkgdesc='IDE for Java, Groovy and other programming languages with advanced
refactoring features'
url='https://www.jetbrains.com/idea/'
@@ -13,8 +15,8 @@
arch=('x86_64')
license=('Apache')
backup=('usr/share/idea/bin/idea64.vmoptions')
-depends=('giflib' 'java-environment=11' 'python' 'sh' 'ttf-font'
'libdbusmenu-glib' 'fontconfig' 'hicolor-icon-theme')
-makedepends=('ant' 'git' 'java-environment=11')
+depends=('giflib' "jre${_jrever}-openjdk" 'python' 'sh' 'ttf-font'
'libdbusmenu-glib' 'fontconfig' 'hicolor-icon-theme')
+makedepends=('ant' 'git' "jdk${_jdkver}-openjdk")
optdepends=(
'lldb: lldb frontend integration'
)
@@ -27,7 +29,7 @@
'SKIP'
'SKIP'
'049c4326b6b784da0c698cf62262b591b20abb52e0dcf869f869c0c655f3ce93'
- '115f1091edb138a7a7b15980e8538b4dfd28054cfab38b844df6d918b1b881c5')
+ 'd7e4a325fccd48b8c8b0a6234df337b58364e648bb9b849e85ca38a059468e71')
prepare() {
cd intellij-community
@@ -46,12 +48,11 @@
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
+
./installers.cmd -Dintellij.build.use.compiled.classes=false
-Dintellij.build.target.os=linux
tar -xf out/idea-ce/artifacts/ideaIC-${_build}-no-jbr.tar.gz -C "${srcdir}"
}
Modified: idea.sh
===================================================================
--- idea.sh 2022-09-29 11:57:10 UTC (rev 1316055)
+++ idea.sh 2022-09-29 12:04:44 UTC (rev 1316056)
@@ -1,14 +1,11 @@
#!/bin/sh
-# WARNING:
-# Running IntelliJ IDEA with java other than java 11
-# may cause various problems, such as Graddle import not working
if [ -z "$IDEA_JDK" ] ; then
- IDEA_JDK="/usr/lib/jvm/java-11-openjdk/"
+ IDEA_JDK="/usr/lib/jvm/java-17-openjdk/"
fi
# open-jfx location that should match the JDK version
if [ -z "$IDEA_JFX" ] ; then
- IDEA_JFX="/usr/lib/jvm/java-11-openjfx/"
+ IDEA_JFX="/usr/lib/jvm/java-17-openjfx/"
fi
# classpath according to defined JDK/JFX
if [ -z "$IDEA_CLASSPATH" ] ; then
Deleted: skip_jps_build.patch
===================================================================
--- skip_jps_build.patch 2022-09-29 11:57:10 UTC (rev 1316055)
+++ skip_jps_build.patch 2022-09-29 12:04:44 UTC (rev 1316056)
@@ -1,25 +0,0 @@
---- build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy
(revision 0ea5972cdad569407078fb27070c80e2b9235c53)
-+++ build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy
(date 1658877188674)
-@@ -41,11 +41,6 @@
- context.options.incrementalCompilation = true
- def tasks = BuildTasks.create(context)
- tasks.buildDistributions()
-- context.messages.block("Build standalone JPS") {
-- Path jpsArtifactDir = context.paths.artifactDir.resolve("jps")
-- new CommunityStandaloneJpsBuilder(context)
-- .processJpsLayout(jpsArtifactDir, context.fullBuildNumber, new
ProjectStructureMapping(), true, {})
-- }
- }
-
- void buildUnpackedDistribution(Path targetDirectory) {
---- jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java
(revision 0ea5972cdad569407078fb27070c80e2b9235c53)
-+++ jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java (date
1663195749722)
-@@ -190,6 +190,8 @@
- ProjectDescriptor descriptor = buildRunner.load(messageHandler,
dataStorageRoot, new BuildFSState(true));
- try {
- buildRunner.runBuild(descriptor, CanceledStatus.NULL, messageHandler,
BuildType.BUILD, scopes, includeDependenciesToScope);
-+ } catch (Exception e) {
-+ System.out.println("LEO EXCEPTION: " +
Arrays.toString(e.getStackTrace()));
- }
- finally {
- descriptor.release();
