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

[Leonidas Spyropoulos]

    Date: Tuesday, April 12, 2022 @ 18:20:45
  Author: artafinde
Revision: 1185992

intellij-idea-community-edition: 2022.1 upstream release

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

---------------------------+
 PKGBUILD                  |   22 ++++------------------
 kotlin_dist_for_ide.patch |   10 ----------
 2 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-12 16:43:50 UTC (rev 1185991)
+++ PKGBUILD	2022-04-12 18:20:45 UTC (rev 1185992)
@@ -4,8 +4,8 @@
 # Maintainer: Orhun Parmaksız <orhun at archlinux.org>
 
 pkgname=intellij-idea-community-edition
-pkgver=2021.3.3
-_build=213.7172.25
+pkgver=2022.1
+_build=221.5080.210
 pkgrel=1
 epoch=4
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features'
@@ -23,7 +23,6 @@
         idea-adt-tools-base::"git://git.jetbrains.org/idea/adt-tools-base.git#commit=17e9c8b666cac0b974b1efc5e1e4c33404f72904"
         idea.desktop
         idea.sh
-        kotlin_dist_for_ide.patch
         skip_jps_build.patch)
 sha256sums=('SKIP'
             'SKIP'
@@ -30,7 +29,6 @@
             'SKIP'
             '049c4326b6b784da0c698cf62262b591b20abb52e0dcf869f869c0c655f3ce93'
             '115f1091edb138a7a7b15980e8538b4dfd28054cfab38b844df6d918b1b881c5'
-            '438be6cb2ee731f6f89ba56506e0fac8aac7136c7dc89d3b4f332351d60d7a1e'
             'b023d7621674f335c32790e25bddadcec483342835af24ab9a3b80d0afc16a0e')
 
 prepare() {
@@ -40,17 +38,10 @@
   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 -Didea.home.path=/' -i build.xml
   echo ${_build} > build.txt
 }
 
@@ -61,7 +52,7 @@
   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
-  ant -Dintellij.build.target.os=linux build
+  ./installers.cmd -Dintellij.build.target.os=linux
   tar -xf out/idea-ce/artifacts/ideaIC-${_build}-no-jbr.tar.gz -C "${srcdir}"
 }
 
@@ -68,13 +59,8 @@
 package() {
   cd idea-IC-${_build}
 
-  # workaround FS#40934
-  sed -i 's/lcd/on/' bin/*.vmoptions
-
-  rm -rf bin/fsnotifier-arm lib/libpty/linux/x86
-
   install -dm 755 "${pkgdir}"/usr/share/{licenses,pixmaps,idea,icons/hicolor/scalable/apps}
-  cp -dr --no-preserve='ownership' bin lib plugins redist "${pkgdir}"/usr/share/idea/
+  cp -dr --no-preserve='ownership' bin lib plugins "${pkgdir}"/usr/share/idea/
   cp -dr --no-preserve='ownership' license "${pkgdir}"/usr/share/licenses/idea
   ln -s /usr/share/idea/bin/idea.png "${pkgdir}"/usr/share/pixmaps/
   ln -s /usr/share/idea/bin/idea.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/

Deleted: kotlin_dist_for_ide.patch
===================================================================
--- kotlin_dist_for_ide.patch	2022-04-12 16:43:50 UTC (rev 1185991)
+++ kotlin_dist_for_ide.patch	2022-04-12 18:20:45 UTC (rev 1185992)
@@ -1,10 +0,0 @@
---- 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>