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

Maxime Gauduin alucryd at archlinux.org
Mon Sep 9 13:44:10 UTC 2019


    Date: Monday, September 9, 2019 @ 13:44:09
  Author: alucryd
Revision: 509096

upgpkg: pycharm-community-edition 2019.2.1-1

Modified:
  pycharm-community-edition/trunk/PKGBUILD
  pycharm-community-edition/trunk/pycharm.sh
Deleted:
  pycharm-community-edition/trunk/pycharm-build.patch

---------------------+
 PKGBUILD            |   34 +++++++++++++++++++---------------
 pycharm-build.patch |   40 ----------------------------------------
 pycharm.sh          |    2 +-
 3 files changed, 20 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-09 10:19:22 UTC (rev 509095)
+++ PKGBUILD	2019-09-09 13:44:09 UTC (rev 509096)
@@ -2,9 +2,9 @@
 # Contributor: David Keogh <davekeogh at archlinux.us>
 
 pkgname=pycharm-community-edition
-pkgver=2018.3.5
-_build=183.5912.18
-pkgrel=2
+pkgver=2019.2.1
+_build=192.6262.63
+pkgrel=1
 pkgdesc='Python IDE for Professional Developers'
 arch=(x86_64)
 url=https://www.jetbrains.com/pycharm/
@@ -11,7 +11,8 @@
 license=(APACHE)
 depends=(
   giflib
-  java-runtime=8
+  glib2
+  java-runtime=11
   python
   sh
   ttf-font
@@ -23,6 +24,7 @@
 )
 makedepends=(
   ant
+  git
   java-environment=8
   java8-openjfx
   python2-setuptools
@@ -29,31 +31,33 @@
   python-setuptools
 )
 source=(
-  pycharm-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/pycharm/${_build}.tar.gz
-  pycharm-build.patch
+  git+https://github.com/JetBrains/intellij-community.git#commit=c174f139a77b056fc33292eab4248bbef2ef8f8c
   pycharm.desktop
   pycharm.sh
 )
-sha256sums=('d122487912ae50a8ee84e6b48dba671dba6d72f3ee8cc7e3eb22927424a096a9'
-            '1cc14afd8478e03efccb77b3c490efa4c720301d02c76ff1ff84659008dcb558'
+sha256sums=('SKIP'
             '28e0d3200c721e61831d8246eba8f72485d3c8379d10bfa75ccb5331b6749480'
-            '448f90f35f1ae1de784b663e9fd539baf494a7c08a8a7e2efbd5e75c801da12e')
+            'eaae397aebb9df4681f5813c82afcc2292e3ea2978d02ce68be3ee89c824e996')
 
 prepare() {
-  cd intellij-community-pycharm-${_build}
+  cd intellij-community
 
-  patch -Np1 -i ../pycharm-build.patch
-  sed "s/SNAPSHOT/${_build}/" -i python/build.xml
+  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
+  sed "s/SNAPSHOT/PC-${_build}/; s/-Xmx612m -XX:MaxPermSize=152m/-Xmx2048m -XX:MaxPermSize=512m/" -i python/build.xml
   sed '/intellij\.markdown/d' -i python/{build/plugin-list.txt,intellij.pycharm.community.main.iml}
 }
 
 build() {
-  cd intellij-community-pycharm-${_build}/python
+  cd intellij-community/python
 
   unset _JAVA_OPTIONS
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+  export PATH="$JAVA_HOME/bin:$PATH"
 
-  ant build
-  tar -xf ../out/pycharm-ce/artifacts/pycharmPC-${_build}-no-jdk.tar.gz -C "${srcdir}"
+  ant -Dintellij.build.target.os=linux build
+  tar -xf ../out/pycharm-ce/artifacts/pycharmPC-${_build}-no-jbr.tar.gz -C "${srcdir}"
 
   cd ../../pycharm-community-${pkgver}
 

Deleted: pycharm-build.patch
===================================================================
--- pycharm-build.patch	2019-09-09 10:19:22 UTC (rev 509095)
+++ pycharm-build.patch	2019-09-09 13:44:09 UTC (rev 509096)
@@ -1,40 +0,0 @@
-diff -rupN intellij-community-pycharm-183.5429.31.orig/build/dependencies/setupJbre.gradle intellij-community-pycharm-183.5429.31/build/dependencies/setupJbre.gradle
---- intellij-community-pycharm-183.5429.31.orig/build/dependencies/setupJbre.gradle	2019-01-31 10:59:48.043742670 +0100
-+++ intellij-community-pycharm-183.5429.31/build/dependencies/setupJbre.gradle	2019-01-31 11:02:00.181362763 +0100
-@@ -1,7 +1,7 @@
- def setupJbre = task setupJbre {}
- 
- 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)
-@@ -169,4 +169,4 @@ static def archToDownload(platform, is32
- static def modularJdkSpecificFiles(platform) {
-   def prefix = platform == 'osx' ? 'jdk/Contents/Home/' : ''
-   ["${prefix}jmods/**", "${prefix}include/**", '**/src.zip', "${prefix}lib/src.zip"]
--}
-\ No newline at end of file
-+}
-diff -rupN intellij-community-pycharm-183.5429.31.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy intellij-community-pycharm-183.5429.31/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy
---- intellij-community-pycharm-183.5429.31.orig/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2019-01-31 11:00:02.063843803 +0100
-+++ intellij-community-pycharm-183.5429.31/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy	2019-01-31 11:00:42.494135478 +0100
-@@ -19,7 +19,7 @@ class BuildOptions {
-   /**
-    * Specifies for which operating systems distributions should be built.
-    */
--  String targetOS = System.getProperty("intellij.build.target.os", OS_ALL)
-+  String targetOS = System.getProperty("intellij.build.target.os", OS_LINUX)
-   static final String OS_LINUX = "linux"
-   static final String OS_WINDOWS = "windows"
-   static final String OS_MAC = "mac"
-@@ -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
-    * get the actual build number in build scripts.
-    */
--  String buildNumber = System.getProperty("build.number")
-+  String buildNumber = System.getProperty("idea.build.number")
- 
-   /**
-    * By default build process produces temporary and resulting files under projectHome/out/productName directory, use this property to

Modified: pycharm.sh
===================================================================
--- pycharm.sh	2019-09-09 10:19:22 UTC (rev 509095)
+++ pycharm.sh	2019-09-09 13:44:09 UTC (rev 509096)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$PYCHARM_JDK" ] ; then
-  PYCHARM_JDK="/usr/lib/jvm/java-8-openjdk/"
+  PYCHARM_JDK="/usr/lib/jvm/java-11-openjdk/"
 fi
 exec env PYCHARM_JDK=$PYCHARM_JDK /usr/share/pycharm/bin/pycharm.sh $@
 


More information about the arch-commits mailing list