Date: Wednesday, December 5, 2018 @ 17:41:10 Author: anthraxx Revision: 411568
intellij-community-edition: prepare upgrade to 2018.3 Modified: intellij-idea-community-edition/trunk/PKGBUILD intellij-idea-community-edition/trunk/idea-build.patch ------------------+ PKGBUILD | 9 ++++----- idea-build.patch | 21 +++++++-------------- 2 files changed, 11 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-05 17:21:35 UTC (rev 411567) +++ PKGBUILD 2018-12-05 17:41:10 UTC (rev 411568) @@ -3,9 +3,9 @@ # Maintainer: Maxime Gauduin <[email protected]> pkgname=intellij-idea-community-edition -pkgver=2018.2.6 -_build=182.5107.16 -_adt_tools_base_commit=70a9f8b3756d917717a04140b858a23eef5e60ca +pkgver=2018.3 +_build=183.4284.148 +_adt_tools_base_commit=e841aa025aa62a4250040ca2a538daabbff54cf5 pkgrel=1 epoch=2 pkgdesc='IDE for Java, Groovy and other programming languages with advanced refactoring features' @@ -15,7 +15,7 @@ backup=('usr/share/idea/bin/idea.vmoptions' 'usr/share/idea/bin/idea64.vmoptions') depends=('giflib' 'java-environment=8' 'python' 'sh' 'ttf-font') -makedepends=('apache-ant' 'git' 'java-openjfx') +makedepends=('ant' 'git' 'java-openjfx') source=(idea-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/idea/${_build}.tar.gz idea-android-${_build}.tar.gz::https://github.com/JetBrains/android/archive/idea/${_build}.tar.gz idea-adt-tools-base::"git://git.jetbrains.org/idea/adt-tools-base.git#commit=${_adt_tools_base_commit}" @@ -34,7 +34,6 @@ patch -Np1 -i ../idea-build.patch echo ${_build} > build.txt ln -s "${srcdir}"/android-idea-${_build} android - ls -lah android/ ln -s "${srcdir}"/idea-adt-tools-base android/tools-base } Modified: idea-build.patch =================================================================== --- idea-build.patch 2018-12-05 17:21:35 UTC (rev 411567) +++ idea-build.patch 2018-12-05 17:41:10 UTC (rev 411568) @@ -2,14 +2,14 @@ --- intellij-community-pycharm-182.1177.orig/build/dependencies/setupJbre.gradle 2018-03-29 19:26:20.265970726 +0200 +++ intellij-community-pycharm-182.1177/build/dependencies/setupJbre.gradle 2018-03-29 19:26:52.690160085 +0200 @@ -1,7 +1,7 @@ - task setupJbre {} + def setupJbre = task setupJbre {} - def jdkRepo = inJetBrainsNetwork ? 'http://repo.labs.intellij.net/intellij-jdk' : 'https://dl.bintray.com/jetbrains/intellij-jdk' --def targetOs = "${System.getProperty("intellij.build.target.os", "all")}" -+def targetOs = "${System.getProperty("intellij.build.target.os", "linux")}" - - jrePlatformsToDownload(targetOs).each { platform -> - archToDownload(platform).each { arch -> + def jdkRepo = 'https://cache-redirector.jetbrains.com/intellij-jdk' +-def targetOs = System.getProperty("intellij.build.target.os", "all") ++def targetOs = System.getProperty("intellij.build.target.os", "linux") + def bundledJreVersion = System.getProperty("intellij.build.bundled.jre.version", "8").toInteger() + def isBundledJreModular = bundledJreVersion >= 9 + def jreArtifactBuild = System.getProperty("intellij.build.bundled.jre.build", jdkBuild) 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:31:46.883868914 +0200 @@ -31,10 +31,3 @@ /** * By default build process produces temporary and resulting files under projectHome/out/productName directory, use this property to -@@ -115,4 +115,4 @@ class BuildOptions { - */ - boolean isInDevelopmentMode = SystemProperties.getBooleanProperty("intellij.build.dev.mode", - System.getProperty("teamcity.buildType.id") == null) --} -\ No newline at end of file -+}
