[packages/phpstorm] up to 5.0.1
glen
glen at pld-linux.org
Wed Sep 26 18:06:37 CEST 2012
commit 400a74c2de64b83bba6305de6fde3cf279fcdcb6
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Sep 26 19:05:56 2012 +0300
up to 5.0.1
phpstorm.spec | 6 +++---
pld.patch | 21 ++++++---------------
2 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/phpstorm.spec b/phpstorm.spec
index 191d3d2..786b391 100644
--- a/phpstorm.spec
+++ b/phpstorm.spec
@@ -1,11 +1,11 @@
Summary: Lightweight and Smart PHP IDE
Name: phpstorm
-Version: 4.0.3
+Version: 5.0.1
Release: 1
License: ?
Group: Development/Tools
Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5: 4af5a2e4727723c0f5c00b951d80e485
+# NoSource0-md5: f0442ccc371d5263c5e4456f2448535d
NoSource: 0
Source1: %{name}.desktop
Patch0: pld.patch
@@ -39,7 +39,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-117.746
+%setup -qn PhpStorm-121.215
# 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 38fa72e..f323706 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,30 +1,21 @@
---- PhpStorm-117.257/bin/phpstorm.sh~ 2012-04-22 15:47:51.000000000 +0300
-+++ PhpStorm-117.257/bin/phpstorm.sh 2012-04-26 20:30:01.239110387 +0300
-@@ -37,7 +37,7 @@
- fi
- fi
-
-- if [ -z "$JDK" -a -x "/bin/readlink" ]; then
-+ if [ -z "$JDK" -a -x "/bin/bin/readlink" ]; then
- JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`
- case "$JAVA_LOCATION" in
- */jre/bin/java)
-@@ -132,8 +132,14 @@
+--- PhpStorm-121.215/bin/phpstorm.sh~ 2012-09-12 10:45:30.000000000 +0300
++++ PhpStorm-121.215/bin/phpstorm.sh 2012-09-13 11:20:32.457844651 +0300
+@@ -149,8 +149,14 @@
fi
fi
-+WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde40"
++WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde50"
+# versioned dir does not exist, use unversioned
+if [ ! -d "$WEBIDE_CONFIG_HOME" ]; then
+ WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde"
+fi
+
- COMMON_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.paths.selector=WebIde40 $IDE_PROPERTIES_PROPERTY"
+ COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde50 $IDE_PROPERTIES_PROPERTY"
-IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true"
+IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true -Dwebide.config.home=$WEBIDE_CONFIG_HOME"
ALL_JVM_ARGS="$VM_OPTIONS $COMMON_JVM_ARGS $IDE_JVM_ARGS $AGENT $REQUIRED_JVM_ARGS"
- CLASSPATH="../lib/bootstrap.jar"
+ CLASSPATH="$IDE_HOME/lib/bootstrap.jar"
--- PhpStorm-117.257/bin/idea.properties~ 2012-04-22 15:43:53.000000000 +0300
+++ PhpStorm-117.257/bin/idea.properties 2012-04-26 20:31:24.809350768 +0300
@@ -13,21 +13,25 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phpstorm.git/commitdiff/400a74c2de64b83bba6305de6fde3cf279fcdcb6
More information about the pld-cvs-commit
mailing list