commit 0304cfdc30a08969b4fdc02a6ec6ac1838421632
Author: Elan Ruusamäe <[email protected]>
Date: Mon Mar 21 14:33:51 2016 +0200
up to 2016.1
phpstorm.spec | 8 ++++----
pld.patch | 34 +++++++++++++++++++++-------------
2 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/phpstorm.spec b/phpstorm.spec
index 9dbf8f4..3a5f6c8 100644
--- a/phpstorm.spec
+++ b/phpstorm.spec
@@ -1,13 +1,13 @@
%include /usr/lib/rpm/macros.java
Summary: Lightweight and Smart PHP IDE
Name: phpstorm
-Version: 10.0.3
+Version: 2016.1
Release: 1
# TODO: figure out what's the licensing and redistribution
License: ?
Group: Development/Tools
-Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5: 772a91d01b31a975a94ca43750a41e61
+Source0: https://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
+# NoSource0-md5: f590386e9659ca4f0335558d18d60bdd
NoSource: 0
Source1: %{name}.desktop
Source2: %{name}.py
@@ -46,7 +46,7 @@ Note: PhpStorm includes all the functionality of WebStorm
(HTML/CSS
Editor, JavaScript Editor) and adds full-fledged support for PHP.
%prep
-%setup -qn PhpStorm-143.1770
+%setup -qn PhpStorm-145.258.2
# keep only single arch files (don't want to pull 32bit deps by default),
# if you want to mix, install rpm from both arch
diff --git a/pld.patch b/pld.patch
index e5c3b33..77ebb3a 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,29 +1,37 @@
---- PhpStorm-141.1912/bin/phpstorm.sh~ 2015-07-07 13:24:20.000000000 +0300
-+++ PhpStorm-141.1912/bin/phpstorm.sh 2015-07-22 13:30:21.733198210 +0300
-@@ -157,7 +157,10 @@
- fi
+--- PhpStorm-145.258.2/bin/phpstorm.sh~ 2016-03-16 17:03:50.000000000
+0200
++++ PhpStorm-145.258.2/bin/phpstorm.sh 2016-03-21 11:05:59.385371297 +0200
+@@ -178,6 +178,11 @@
+ CLASSPATH="$CLASSPATH:$WEBIDE_CLASSPATH"
fi
--IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true"
+WEBIDE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/PhpStorm"
+WEBIDE_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/PhpStorm"
+
-+IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true
-Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR"
-
- CLASSPATH="$IDE_HOME/lib/bootstrap.jar"
- CLASSPATH="$CLASSPATH:$IDE_HOME/lib/extensions.jar"
---- PhpStorm-133.982/bin/idea.properties~ 2014-02-25 05:43:47.000000000
+0200
-+++ PhpStorm-133.982/bin/idea.properties 2014-03-19 23:57:13.956684223
+0200
++IDE_JVM_ARGS="-Dwebide.config.dir=$WEBIDE_CONFIG_DIR
-Dwebide.cache.dir=$WEBIDE_CACHE_DIR"
++
+ # ---------------------------------------------------------------------
+ # Run the IDE.
+ # ---------------------------------------------------------------------
+@@ -193,6 +198,7 @@
+ -Djb.restart.code=88 -Didea.paths.selector=PhpStorm2016.1 \
+ $IDE_PROPERTIES_PROPERTY \
+ -Didea.platform.prefix=PhpStorm \
++ $IDE_JVM_ARGS \
+ com.intellij.idea.Main \
+ "$@"
+ EC=$?
+--- PhpStorm-145.258.2/bin/idea.properties~ 2016-03-16 17:02:05.000000000
+0200
++++ PhpStorm-145.258.2/bin/idea.properties 2016-03-21 11:07:02.191952728
+0200
@@ -6,21 +6,25 @@
# Uncomment this option if you want to customize path to IDE config folder.
Make sure you're using forward slashes.
#---------------------------------------------------------------------
- # idea.config.path=${user.home}/.WebIde/config
+ # idea.config.path=${user.home}/.PhpStorm/config
+idea.config.path=${webide.config.dir}
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to IDE system folder.
Make sure you're using forward slashes.
#---------------------------------------------------------------------
- # idea.system.path=${user.home}/.WebIde/system
+ # idea.system.path=${user.home}/.PhpStorm/system
+idea.system.path=${webide.cache.dir}
#---------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phpstorm.git/commitdiff/8c9cf93b54dc64476d15286853f2d01041d806c8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
