[arch-commits] Commit in intellij-idea-community-edition/trunk (3 files)

[Orhun Parmaksiz]

    Date: Sunday, September 12, 2021 @ 10:17:30
  Author: orhun
Revision: 1014540

upgpkg: intellij-idea-community-edition 4:2021.2.1-1: upstream release

Added:
  intellij-idea-community-edition/trunk/kotlin_dist_for_ide.patch
  intellij-idea-community-edition/trunk/skip_jps_build.patch
Modified:
  intellij-idea-community-edition/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   23 +++++++++++++++++------
 kotlin_dist_for_ide.patch |   10 ++++++++++
 skip_jps_build.patch      |   22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-12 09:27:15 UTC (rev 1014539)
+++ PKGBUILD	2021-09-12 10:17:30 UTC (rev 1014540)
@@ -4,8 +4,8 @@
 # Maintainer: Orhun Parmaksız <orhun at archlinux.org>
 
 pkgname=intellij-idea-community-edition
-pkgver=2021.1.3
-_build=211.7628.21
+pkgver=2021.2.1
+_build=212.5080.55
 pkgrel=1
 epoch=4
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features'
@@ -23,12 +23,16 @@
         idea-android::"git://git.jetbrains.org/idea/android.git#tag=idea/${_build}"
         idea-adt-tools-base::"git://git.jetbrains.org/idea/adt-tools-base.git#commit=17e9c8b666cac0b974b1efc5e1e4c33404f72904"
         idea.desktop
-        idea.sh)
+        idea.sh
+        kotlin_dist_for_ide.patch
+        skip_jps_build.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '049c4326b6b784da0c698cf62262b591b20abb52e0dcf869f869c0c655f3ce93'
-            '115f1091edb138a7a7b15980e8538b4dfd28054cfab38b844df6d918b1b881c5')
+            '115f1091edb138a7a7b15980e8538b4dfd28054cfab38b844df6d918b1b881c5'
+            '438be6cb2ee731f6f89ba56506e0fac8aac7136c7dc89d3b4f332351d60d7a1e'
+            'b023d7621674f335c32790e25bddadcec483342835af24ab9a3b80d0afc16a0e')
 
 prepare() {
   cd intellij-community
@@ -37,10 +41,17 @@
   mv "${srcdir}"/idea-android android
   mv "${srcdir}"/idea-adt-tools-base android/tools-base
 
+  # https://youtrack.jetbrains.com/issue/KTIJ-19348
+  patch -p0 -i ../kotlin_dist_for_ide.patch
+
+  # https://youtrack.jetbrains.com/issue/IDEA-276102
+  # https://youtrack.jetbrains.com/issue/IDEA-277775
+  patch -p0 -i ../skip_jps_build.patch
+
   sed '/def targetOs =/c def targetOs = "linux"' -i build/dependencies/setupJbre.gradle
   sed '/String targetOS/c   String targetOS = OS_LINUX' -i platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
   sed -E 's|(<sysproperty key="jna.nosys")|<sysproperty key="intellij.build.target.os" value="linux" />\1|' -i build.xml
-  sed -E 's/-Xmx[0-9]+m/-XX:-UseGCOverheadLimit/' -i build.xml
+  sed -E 's/-Xmx[0-9]+m/-XX:-UseGCOverheadLimit -Didea.home.path=/' -i build.xml
   echo ${_build} > build.txt
 }
 
@@ -51,7 +62,7 @@
   export PATH="${JAVA_HOME}/bin:${PATH}"
   export JDK_16_x64=/usr/lib/jvm/java-8-openjdk
   export JDK_18_x64=/usr/lib/jvm/java-8-openjdk
-  ant build
+  ant -Dintellij.build.target.os=linux build
   tar -xf out/idea-ce/artifacts/ideaIC-${_build}-no-jbr.tar.gz -C "${srcdir}"
 }
 

Added: kotlin_dist_for_ide.patch
===================================================================
--- kotlin_dist_for_ide.patch	                        (rev 0)
+++ kotlin_dist_for_ide.patch	2021-09-12 10:17:30 UTC (rev 1014540)
@@ -0,0 +1,10 @@
+--- build/gant.xml	2021-08-15 22:21:20.754681765 +0300
++++ build/gant.xml	2021-08-15 22:23:21.874689724 +0300
+@@ -57,6 +57,7 @@
+         <dependency coords="com.jetbrains.intellij.platform:test-framework-core:${jps.bootstrap.library.version}"/>
+         <dependency coords="commons-cli:commons-cli:1.2"/>
+         <dependency coords="de.pdark:decentxml:1.4"/>
++        <dependency coords="org.jetbrains.kotlin:kotlin-dist-for-ide:1.5.10-release-896"/>
+       </resolver:dependencies>
+       <resolver:path refid="classpath.buildscripts" classpath="runtime"/>
+     </resolver:resolve>

Added: skip_jps_build.patch
===================================================================
--- skip_jps_build.patch	                        (rev 0)
+++ skip_jps_build.patch	2021-09-12 10:17:30 UTC (rev 1014540)
@@ -0,0 +1,22 @@
+--- build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy	2021-09-09 23:57:31.252582123 +0300
++++ build/groovy/org/jetbrains/intellij/build/IdeaCommunityBuilder.groovy	2021-09-09 23:58:18.939737294 +0300
+@@ -41,15 +41,15 @@
+     buildContext.options.incrementalCompilation = true
+     def tasks = BuildTasks.create(buildContext)
+     tasks.buildDistributions()
+-    buildContext.messages.block("Build standalone JPS") {
++    /*buildContext.messages.block("Build standalone JPS") {
+       String jpsArtifactDir = "$buildContext.paths.artifacts/jps"
+       new CommunityStandaloneJpsBuilder(buildContext).processJpsLayout(jpsArtifactDir, buildContext.fullBuildNumber, new ProjectStructureMapping(),
+                                                                        true, {})
+-    }
++    }*/
+     tasks.buildUpdaterJar()
+   }
+ 
+   void buildUnpackedDistribution(String targetDirectory) {
+     BuildTasks.create(buildContext).buildUnpackedDistribution(Paths.get(targetDirectory), false)
+   }
+-}
+\ No newline at end of file
++}