Updated to 2018.1.1

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de74a0ef30a2..50c3cfabf2bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = pycharm-edu
 	pkgdesc = Free, Easy & Professional Tool to Learn Programming with Python
-	pkgver = 2017.3.0
+	pkgver = 2018.1.1
 	pkgrel = 1
 	url = https://www.jetbrains.com/pycharm-edu/
-	arch = any
+	arch = x86_64
 	license = Apache
+	makedepends = python2-setuptools
+	makedepends = python-setuptools
 	depends = giflib
 	depends = ttf-font
 	depends = libxtst
@@ -12,10 +14,9 @@ pkgbase = pycharm-edu
 	optdepends = ipython2: For enhanced interactive Python shell v2
 	optdepends = ipython: For enhanced interactive Python shell v3
 	provides = pycharm-edu
-	options = !strip
-	source = https://download.jetbrains.com/python/pycharm-edu-2017.3.tar.gz
+	source = https://download.jetbrains.com/python/pycharm-edu-2018.1.1.tar.gz
 	source = pycharm-edu.desktop
-	sha256sums = ab6ca772759f1b4f658f058023addf6807491afd967e60fe95251df1f44de06c
+	sha256sums = d8f153879683b16c5e11f56430105e7898b5e832ada527b8f3500ceb947ac54e
 	sha256sums = 2934fbe579bcc3d6e9d66f9ee80286e36773fe59aafaef9d15bbb45a0a59c58b
 
 pkgname = pycharm-edu
diff --git a/PKGBUILD b/PKGBUILD
index 515552b0b21a..231e153facba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,35 @@
 # Maintainer: XavierCLL <xavier.corredor.llano (a) gmail.com>
 
 pkgname=pycharm-edu
-pkgver=2017.3.0
-_pkgver=2017.3
+pkgver=2018.1.1
+_pkgver=2018.1.1
 pkgrel=1
 pkgdesc="Free, Easy & Professional Tool to Learn Programming with Python"
-arch=('any')
-options=('!strip')
+arch=('x86_64')
 url="https://www.jetbrains.com/pycharm-edu/"
 provides=('pycharm-edu')
 license=('Apache')
 depends=('giflib' 'ttf-font' 'libxtst' 'libxslt')
+makedepends=('python2-setuptools' 'python-setuptools')
 source=(https://download.jetbrains.com/python/$pkgname-$_pkgver.tar.gz
         'pycharm-edu.desktop')
 optdepends=('ipython2: For enhanced interactive Python shell v2'
             'ipython: For enhanced interactive Python shell v3')
-sha256sums=('ab6ca772759f1b4f658f058023addf6807491afd967e60fe95251df1f44de06c'
+sha256sums=('d8f153879683b16c5e11f56430105e7898b5e832ada527b8f3500ceb947ac54e'
             '2934fbe579bcc3d6e9d66f9ee80286e36773fe59aafaef9d15bbb45a0a59c58b')
 
+build() {
+  cd pycharm-edu-$_pkgver
+
+  # compile PyDev debugger used by PyCharm to speedup debugging
+  python2 helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
+  python3 helpers/pydev/setup_cython.py build_ext --build-temp build --build-lib .
+  
+  rm -rf bin/fsnotifier{,-arm} lib/libpty/linux/x86
+}
+            
 package() {
   # base
-  cd $srcdir
   install -dm 755 $pkgdir/opt/$pkgname
   cp -dr --no-preserve=ownership $srcdir/$pkgname-$_pkgver/* $pkgdir/opt/$pkgname
   install -dm 755 $pkgdir/usr/share/{applications,pixmaps}
@@ -37,18 +46,6 @@ package() {
   # app file desktop
   install -Dm 644 $startdir/$pkgname.desktop $pkgdir/usr/share/applications/
     
-  # delete some conflicts files for i686 
-  if [[ $CARCH = 'i686' ]]; then
-    rm -f $pkgdir/opt/$pkgname/bin/libyjpagent-linux64.so
-    rm -f $pkgdir/opt/$pkgname/bin/fsnotifier64
-  fi
-    
   # enable anti-aliasing text in pycharm options
-  if [[ $CARCH = 'i686' ]]; then
-    #echo '-Dawt.useSystemAAFontSettings=on' >> $pkgdir/opt/$pkgname/bin/pycharm.vmoptions
-    echo '-Dswing.aatext=true' >> $pkgdir/opt/$pkgname/bin/pycharm.vmoptions
-  else
-    #echo '-Dawt.useSystemAAFontSettings=on' >> $pkgdir/opt/$pkgname/bin/pycharm64.vmoptions
-    echo '-Dswing.aatext=true' >> $pkgdir/opt/$pkgname/bin/pycharm64.vmoptions
-  fi
+  echo '-Dswing.aatext=true' >> $pkgdir/opt/$pkgname/bin/pycharm64.vmoptions
 }