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

2019-09-26 Thread Levente Polyak via arch-commits 
Date: Thursday, September 26, 2019 @ 08:45:32
  Author: anthraxx
Revision: 511816

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

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

--+
 PKGBUILD |   24 +---
 idea-build.patch |   21 -
 idea.desktop |2 +-
 3 files changed, 14 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-26 08:41:36 UTC (rev 511815)
+++ PKGBUILD2019-09-26 08:45:32 UTC (rev 511816)
@@ -3,8 +3,8 @@
 # Maintainer: Maxime Gauduin 
 
 pkgname=intellij-idea-community-edition
-pkgver=2019.2.1
-_build=192.6262.58
+pkgver=2019.2.3
+_build=192.6817.14
 pkgrel=1
 epoch=2
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced 
refactoring features'
@@ -15,30 +15,32 @@
 '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')
-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
+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}"
 idea-build.patch
 idea.desktop
 idea.sh)
-sha256sums=('fbf31030d64090a616a6641556817f409593a21fbb4a7aa1748ddc81526d8000'
-'06e201a2f83f9cc542a840e7582e09c316117147bbea95a938cbe98441d42177'
+sha256sums=('SKIP'
 'SKIP'
-'6a94352edfcf7426679d124dfc93395a82e6f14f5910dde7f1ff931781c0c543'
-'fa9e3cba5e26a7e01cecda867f23467322db123c5553dfbb4f14aae034ccbed7'
+'SKIP'
+'666e6128995b3470516dcda3815cd4b11102a20e0835b82446190c495f25cd25'
+'049c4326b6b784da0c698cf62262b591b20abb52e0dcf869f869c0c655f3ce93'
 '5d4f998bec3249165b0e62b5e51e9b7fbe383bb9f1178ffefe070f2c9872eebb')
 
 prepare() {
-  cd intellij-community-idea-${_build}
+  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}"/android-idea-${_build} android
+  mv "${srcdir}"/idea-android android
   mv "${srcdir}"/idea-adt-tools-base android/tools-base
 }
 
 build() {
-  cd intellij-community-idea-${_build}
+  cd intellij-community
   unset _JAVA_OPTIONS
   export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
   export PATH="${JAVA_HOME}/bin:${PATH}"

Modified: idea-build.patch
===
--- idea-build.patch2019-09-26 08:41:36 UTC (rev 511815)
+++ idea-build.patch2019-09-26 08:45:32 UTC (rev 511816)
@@ -1,15 +1,3 @@
-diff -rupN 
intellij-community-pycharm-182.1177.orig/build/dependencies/setupJbre.gradle 
intellij-community-pycharm-182.1177/build/dependencies/setupJbre.gradle
 
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 targetOs = System.getProperty("intellij.build.target.os", "all")
-+def targetOs = System.getProperty("intellij.build.target.os", "linux")
- def jreVersion = System.getProperty("intellij.build.bundled.jre.version", 
"11").toInteger()
- def jreBuild = System.getProperty("intellij.build.bundled.jre.build", 
jdkBuild)
- def jrePrefix = System.getProperty("intellij.build.bundled.jre.prefix")
 --- intellij-community-pycharm-182.1177/build/dependencies/setupJdk.gradle 
2019-04-01 13:07:28.258512665 +0200
 +++ intellij-community-pycharm-182.1177/build/dependencies/setupJdk.gradle 
2019-04-01 13:07:22.691827611 +0200
 @@ -136,9 +136,7 @@
@@ -26,15 +14,6 @@
 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
 +++

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

2019-07-25 Thread Levente Polyak via arch-commits 
Date: Thursday, July 25, 2019 @ 21:15:30
  Author: anthraxx
Revision: 492806

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

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

--+
 PKGBUILD |   18 +-
 idea-build.patch |4 ++--
 idea.sh  |4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-25 21:00:08 UTC (rev 492805)
+++ PKGBUILD2019-07-25 21:15:30 UTC (rev 492806)
@@ -3,9 +3,9 @@
 # Maintainer: Maxime Gauduin 
 
 pkgname=intellij-idea-community-edition
-pkgver=2019.1.3
-_build=191.7479.19
-pkgrel=2
+pkgver=2019.2
+_build=192.5728.98
+pkgrel=1
 epoch=2
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced 
refactoring features'
 url='https://www.jetbrains.com/idea/'
@@ -13,8 +13,8 @@
 license=('Apache')
 backup=('usr/share/idea/bin/idea.vmoptions'
 'usr/share/idea/bin/idea64.vmoptions')
-depends=('giflib' 'java-environment=8' 'python' 'sh' 'ttf-font' 
'libdbusmenu-glib')
-makedepends=('ant' 'kotlin' 'git' 'java8-openjfx')
+depends=('giflib' 'java-environment=11' 'python' 'sh' 'ttf-font' 
'libdbusmenu-glib')
+makedepends=('ant' 'kotlin' 'git' 'java8-openjfx' 'java-environment=8')
 
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#tag=idea/${_build}"
@@ -21,12 +21,12 @@
 idea-build.patch
 idea.desktop
 idea.sh)
-sha256sums=('7aa10cec7e873d23fd08eba9b18eda9a3a6e6a49fb603051f2eb37b45b1069ea'
-'7b1d89afbdbe89a9e2b1773be62620d31b43cdc83ced7168c9a845cacc451946'
+sha256sums=('48b266170e902576b855969bc88aeb5bcb82c8c1c25f2000c6b38d2a7e845d2c'
+'63b50680a569ad907effd9c35de4557b954d6278d0c1553613ab8b730ba596e0'
 'SKIP'
-'d7556a6651ec0c00daa6af3ec205f92945ebae2c5e30d29c04d8f65358e74825'
+'6a94352edfcf7426679d124dfc93395a82e6f14f5910dde7f1ff931781c0c543'
 'fa9e3cba5e26a7e01cecda867f23467322db123c5553dfbb4f14aae034ccbed7'
-'c021dba82f75a18be6ffdc2fe70d616496bbe3a14e7a5efef30c06b4cbd915c3')
+'5d4f998bec3249165b0e62b5e51e9b7fbe383bb9f1178ffefe070f2c9872eebb')
 
 prepare() {
   cd intellij-community-idea-${_build}

Modified: idea-build.patch
===
--- idea-build.patch2019-07-25 21:00:08 UTC (rev 492805)
+++ idea-build.patch2019-07-25 21:15:30 UTC (rev 492806)
@@ -7,7 +7,7 @@
  
 -def targetOs = System.getProperty("intellij.build.target.os", "all")
 +def targetOs = System.getProperty("intellij.build.target.os", "linux")
- def jreVersion = System.getProperty("intellij.build.bundled.jre.version", 
"8").toInteger()
+ def jreVersion = System.getProperty("intellij.build.bundled.jre.version", 
"11").toInteger()
  def jreBuild = System.getProperty("intellij.build.bundled.jre.build", 
jdkBuild)
  def jrePrefix = System.getProperty("intellij.build.bundled.jre.prefix")
 --- intellij-community-pycharm-182.1177/build/dependencies/setupJdk.gradle 
2019-04-01 13:07:28.258512665 +0200
@@ -17,7 +17,7 @@
  // JDK 1.6
  repositories {
 -  maven {
--url 'http://repo.labs.intellij.net/java'
+-url 'https://repo.labs.intellij.net/java'
 -  }
 +  mavenCentral()
  }

Modified: idea.sh
===
--- idea.sh 2019-07-25 21:00:08 UTC (rev 492805)
+++ idea.sh 2019-07-25 21:15:30 UTC (rev 492806)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # WARNING:
-# Running IntelliJ IDEA with java other than java 8
+# Running IntelliJ IDEA with java other than java 11
 # may cause various problems, such as Graddle import not working
 if [ -z "$IDEA_JDK" ] ; then
-  IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
+  IDEA_JDK="/usr/lib/jvm/java-11-openjdk/"
 fi
 exec env IDEA_JDK="$IDEA_JDK" /usr/share/idea/bin/idea.sh "$@"

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

2018-09-09 Thread Levente Polyak via arch-commits 
Date: Sunday, September 9, 2018 @ 18:00:49
  Author: anthraxx
Revision: 378923

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

Modified:
  intellij-idea-community-edition/trunk/PKGBUILD
  intellij-idea-community-edition/trunk/idea.sh
Deleted:
  intellij-idea-community-edition/trunk/idea.install

--+
 PKGBUILD |   36 +++-
 idea.install |   10 --
 idea.sh  |6 --
 3 files changed, 19 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-09 17:43:27 UTC (rev 378922)
+++ PKGBUILD2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,51 +1,46 @@
-# $Id$
 # Maintainer: Lukas Jirkovsky 
 # Maintainer: Levente Polyak 
 # Maintainer: Maxime Gauduin 
 
 pkgname=intellij-idea-community-edition
-pkgver=2018.2.2
-_build=182.4129.33
+pkgver=2018.2.3
+_build=182.4323.46
+_adt_tools_base_commit=70a9f8b3756d917717a04140b858a23eef5e60ca
 pkgrel=1
 epoch=2
 pkgdesc='IDE for Java, Groovy and other programming languages with advanced 
refactoring features'
+url='https://www.jetbrains.com/idea/'
 arch=('x86_64')
-url='https://www.jetbrains.com/idea/'
 license=('Apache')
 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')
-install='idea.install'
-_android_commit='b3cd38efb0d8ca0ae5fb82edf27b82a31122c647'
-_adt_tools_base_commit='70a9f8b3756d917717a04140b858a23eef5e60ca'
-source=("idea-${_build}.tar.gz::https://github.com/JetBrains/intellij-community/archive/idea/${_build}.tar.gz;
-
"idea-android::git://git.jetbrains.org/idea/android.git#commit=${_android_commit}"
-
"idea-adt-tools-base::git://git.jetbrains.org/idea/adt-tools-base.git#commit=${_adt_tools_base_commit}"
-'idea-build.patch'
-'idea.desktop'
-'idea.sh')
-sha256sums=('151b292adf956789a519e12701bf767181bd7cef95902e81a7b6d3c0a98aec90'
+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}"
+idea-build.patch
+idea.desktop
+idea.sh)
+sha256sums=('0eae527f1cee3fe4ca0fd90ff67707e4e304bb71d3e1d4e773e0c4c0245e8643'
+'3a8759e8ba508a16108f5b778739465333433fd9fb540414af0f46a1110131fd'
 'SKIP'
-'SKIP'
 '3793e8125abb05b1580919017469ada2563a2e5972a8d74666557df60d270cfd'
 'fa9e3cba5e26a7e01cecda867f23467322db123c5553dfbb4f14aae034ccbed7'
-'9e2155dd4d352b2410fc689236b15d5c3cb9937d82b50d39ec8b8dbcdfa40de1')
+'c021dba82f75a18be6ffdc2fe70d616496bbe3a14e7a5efef30c06b4cbd915c3')
 
 prepare() {
   cd intellij-community-idea-${_build}
-
   patch -Np1 -i ../idea-build.patch
   echo ${_build} > build.txt
-  ln -s "${srcdir}"/idea-android android
+  ln -s "${srcdir}"/android-idea-${_build} android
+  ls -lah android/
   ln -s "${srcdir}"/idea-adt-tools-base android/tools-base
 }
 
 build() {
   cd intellij-community-idea-${_build}
-
   unset _JAVA_OPTIONS
-
   ant build
   tar -xf out/idea-ce/artifacts/ideaIC-${_build}-no-jdk.tar.gz -C "${srcdir}"
 }
@@ -67,4 +62,3 @@
 }
 
 # vim: ts=2 sw=2 et:
-

Deleted: idea.install
===
--- idea.install2018-09-09 17:43:27 UTC (rev 378922)
+++ idea.install2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,10 +0,0 @@
-post_install() {
-  echo "WARNING:"
-  echo "  Running IntelliJ IDEA with java other than java 8"
-  echo "  may cause various problems, such as Graddle import not working"
-}
-
-post_upgrade() {
-  post_install
-}
-

Modified: idea.sh
===
--- idea.sh 2018-09-09 17:43:27 UTC (rev 378922)
+++ idea.sh 2018-09-09 18:00:49 UTC (rev 378923)
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+# WARNING:
+# Running IntelliJ IDEA with java other than java 8
+# may cause various problems, such as Graddle import not working
 if [ -z "$IDEA_JDK" ] ; then
   IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
 fi
-exec env IDEA_JDK=$IDEA_JDK /usr/share/idea/bin/idea.sh $@
+exec env IDEA_JDK="$IDEA_JDK" /usr/share/idea/bin/idea.sh "$@"
 
 # vim: ts=2 sw=2 et:
-

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

2018-03-30 Thread Lukas Jirkovsky via arch-commits 
Date: Friday, March 30, 2018 @ 21:24:01
  Author: stativ
Revision: 313586

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

update to 2018.1
ensure idea is started with openjdk 8 by default
remove unnecessary cruft from PKGBUILD

Added:
  intellij-idea-community-edition/trunk/idea.sh
Modified:
  intellij-idea-community-edition/trunk/PKGBUILD
  intellij-idea-community-edition/trunk/idea.install

--+
 PKGBUILD |   18 --
 idea.install |   13 +++--
 idea.sh  |5 +
 3 files changed, 20 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-30 20:54:54 UTC (rev 313585)
+++ PKGBUILD2018-03-30 21:24:01 UTC (rev 313586)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky 
 pkgname=intellij-idea-community-edition
-pkgver=2017.3.4
-_pkgver=173.4548.28
+pkgver=2018.1
+_pkgver=181.4203.550
 pkgrel=1
 epoch=2
 pkgdesc="IDE for Java, Groovy and other programming languages with advanced 
refactoring features"
@@ -11,15 +11,16 @@
 license=('Apache')
 backup=('usr/share/intellijidea-ce/bin/idea.vmoptions'
 'usr/share/intellijidea-ce/bin/idea64.vmoptions')
-depends=('java-environment' 'giflib' 'libxtst' 'libxft' 'ttf-font'
+depends=('java-environment=8' 'giflib' 'libxtst' 'libxft' 'ttf-font'
  'coreutils' 'grep' 'which')
 conflicts=('intellij-idea-libs')
 replaces=('intellij-idea-libs')
 install=idea.install
 source=("http://download.jetbrains.com/idea/ideaIC-$pkgver-no-jdk.tar.gz;
-idea.desktop)
-sha256sums=('eeba2eb6b92fa6eb93c0b0864c0d0fd7b6a1b1d210a1fc2fb32c06f882c84abf'
-'bd37ad47c926941108f624cbe5adbd7fe91d198b15aca63d8a0c0da14c7a76a6')
+idea.desktop idea.sh)
+sha256sums=('a8749bf8468ceb0bb957ba88c85eeb1c10a424e2140b1da976cd2d47b2f95426'
+'bd37ad47c926941108f624cbe5adbd7fe91d198b15aca63d8a0c0da14c7a76a6'
+'0e5d6a47b5ae464e9f562110ccc798f55055943e425e0621c0275f72615fdb1d')
 
 package() {
   install -d -m755 "$pkgdir/"usr/share
@@ -28,11 +29,8 @@
   # make sure that all files are owned by root
   chown -R root:root "$pkgdir/usr/share"
 
-  # never wait on user input when starting idea
-  sed -i '/.*read IGNORE.*/ d' "$pkgdir"/usr/share/intellijidea-ce/bin/idea.sh
-
   install -d -m755 "$pkgdir"/usr/bin
-  ln -s /usr/share/intellijidea-ce/bin/idea.sh "$pkgdir"/usr/bin/idea.sh
+  install -D -m755 "$srcdir"/idea.sh "$pkgdir"/usr/bin/idea.sh
   install -D -m644 "$srcdir"/idea.desktop 
"$pkgdir"/usr/share/applications/idea.desktop
   install -D -m644 "$pkgdir"/usr/share/intellijidea-ce/bin/idea.png \
"$pkgdir"/usr/share/pixmaps/idea.png

Modified: idea.install
===
--- idea.install2018-03-30 20:54:54 UTC (rev 313585)
+++ idea.install2018-03-30 21:24:01 UTC (rev 313586)
@@ -1,9 +1,10 @@
 post_install() {
-  if [ `pacman -Qsq java-runtime | grep -c openjdk` -ne 0 ]; then
-echo "WARNING:"
-echo "  Running IntelliJ IDEA using OpenJDK is officially unsupported"
-echo "  because of possible performance and graphics problems"
-  fi
+  echo "WARNING:"
+  echo "  Running IntelliJ IDEA with java other than java 8"
+  echo "  may cause various problems, such as Graddle import not working"
 }
 
-# vim:set ts=2 sw=2 et:
+post_upgrade() {
+  post_install
+}
+

Added: idea.sh
===
--- idea.sh (rev 0)
+++ idea.sh 2018-03-30 21:24:01 UTC (rev 313586)
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -z "$IDEA_JDK" ] ; then
+   IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
+fi
+exec env IDEA_JDK=$IDEA_JDK /usr/share/intellijidea-ce/bin/idea.sh $@


Property changes on: intellij-idea-community-edition/trunk/idea.sh
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property