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

Mon Jan 27 21:18:34 UTC 2020

Date: Monday, January 27, 2020 @ 21:18:34
  Author: anthraxx
Revision: 556527

upgpkg: intellij-idea-community-edition 2:2019.3.2-1

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

------------------+
 PKGBUILD         |   19 +++++++++++--------
 idea-build.patch |   42 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2020-01-27 21:15:35 UTC (rev 556526)
+++ PKGBUILD	2020-01-27 21:18:34 UTC (rev 556527)
@@ -3,8 +3,8 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=intellij-idea-community-edition
-pkgver=2019.3
-_build=193.5233.102
+pkgver=2019.3.2
+_build=193.6015.39
 pkgrel=1
 epoch=2
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features'
@@ -14,7 +14,7 @@
 backup=('usr/share/idea/bin/idea.vmoptions'
         'usr/share/idea/bin/idea64.vmoptions')
 depends=('giflib' 'java-environment=11' 'python' 'sh' 'ttf-font' 'libdbusmenu-glib')
-makedepends=('ant' 'kotlin' 'git' 'java8-openjfx' 'java-environment=8')
+makedepends=('ant' 'git' 'java8-openjfx' 'java-environment=8')
 source=("git+https://github.com/JetBrains/intellij-community.git#tag=idea/${_build}"
         idea-android::"git+https://github.com/JetBrains/android#tag=idea/${_build}"
         idea-adt-tools-base::"git://git.jetbrains.org/idea/adt-tools-base.git#tag=idea/${_build}"
@@ -24,19 +24,22 @@
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            '666e6128995b3470516dcda3815cd4b11102a20e0835b82446190c495f25cd25'
+            'c3beea12e932eadbd4af05f842e4134b904a309a708b0c11e0106a8acbdf859b'
             '049c4326b6b784da0c698cf62262b591b20abb52e0dcf869f869c0c655f3ce93'
             '5d4f998bec3249165b0e62b5e51e9b7fbe383bb9f1178ffefe070f2c9872eebb')
 
 prepare() {
   cd intellij-community
-  patch -Np1 -i ../idea-build.patch
-  echo ${_build} > build.txt
-  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
+
   # build system doesn't like symlinks
   mv "${srcdir}"/idea-android android
   mv "${srcdir}"/idea-adt-tools-base android/tools-base
+
+  patch -Np1 < ../idea-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/-Xmx[0-9]+m/-XX:-UseGCOverheadLimit/' -i build.xml
+  echo ${_build} > build.txt
 }
 
 build() {

Modified: idea-build.patch
===================================================================
--- idea-build.patch	2020-01-27 21:15:35 UTC (rev 556526)
+++ idea-build.patch	2020-01-27 21:18:34 UTC (rev 556527)
@@ -12,7 +12,7 @@
  
  configurations {
 diff -rupN intellij-community-pycharm-182.1177.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy intellij-community-pycharm-182.1177/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
---- intellij-community-pycharm-182.1177.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2018-03-29 19:26:25.415841858 +0200
+--- intellij-community-pycharm-182.1177/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2018-03-29 19:26:25.415841858 +0200
 +++ intellij-community-pycharm-182.1177/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2018-03-29 19:31:46.883868914 +0200
 @@ -100,7 +100,7 @@ class BuildOptions {
     * Build number without product code (e.g. '162.500.10'), if {@code null} '<baseline>.SNAPSHOT' will be used. Use {@link BuildContext#buildNumber} to
@@ -23,3 +23,43 @@
  
    /**
     * By default build process produces temporary and resulting files under projectHome/out/productName directory, use this property to
+--- a/android/android-kotlin/android-extensions-idea/intellij.android.kotlin.extensions.iml	2020-01-27 12:08:36.364855975 +0100
++++ b/android/android-kotlin/android-extensions-idea/intellij.android.kotlin.extensions.iml	2020-01-27 12:08:17.019038646 +0100
+@@ -23,6 +23,7 @@
+     <orderEntry type="module" module-name="intellij.android.kotlin.idea" />
+     <orderEntry type="module" module-name="analytics-crash" />
+     <orderEntry type="library" name="Gradle" level="project" />
++    <orderEntry type="library" name="KotlinPlugin" level="project" />
+     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+     <orderEntry type="library" name="kotlin-plugin" level="project" />
+     <orderEntry type="library" name="KotlinPlugin" level="project" />
+--- a/android/android-kotlin/idea-android/intellij.android.kotlin.idea.iml	2020-01-27 12:07:51.640215834 +0100
++++ b/android/android-kotlin/idea-android/intellij.android.kotlin.idea.iml	2020-01-27 12:07:57.129954977 +0100
+@@ -22,6 +22,7 @@
+     <orderEntry type="library" name="Gradle" level="project" />
+     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
+     <orderEntry type="library" name="kotlin-plugin" level="project" />
++    <orderEntry type="library" name="KotlinPlugin" level="project" />
+     <orderEntry type="module-library" scope="PROVIDED">
+       <library>
+         <CLASSES>
+--- a/android/android/intellij.android.core.iml	2020-01-27 12:03:41.138093020 +0100
++++ b/android/android/intellij.android.core.iml	2020-01-27 12:05:14.352668108 +0100
+@@ -14,6 +14,7 @@
+     <orderEntry type="inheritedJdk" />
+     <orderEntry type="sourceFolder" forTests="false" />
+     <orderEntry type="library" name="freemarker" level="project" />
++    <orderEntry type="library" name="KotlinPlugin" level="project" />
+     <orderEntry type="module" module-name="intellij.java" />
+     <orderEntry type="module" module-name="intellij.xml.dom" />
+     <orderEntry type="module" module-name="intellij.java.execution.impl" />
+--- a/android/android/intellij.android.core.tests.iml	2020-01-27 13:53:50.688352986 +0100
++++ b/android/android/intellij.android.core.tests.iml	2020-01-27 13:53:54.205031818 +0100
+@@ -7,6 +7,7 @@
+     </content>
+     <orderEntry type="inheritedJdk" />
+     <orderEntry type="sourceFolder" forTests="false" />
++    <orderEntry type="library" scope="TEST" name="KotlinPlugin" level="project" />
+     <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
+     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />

