Author: glen Date: Tue Jul 26 11:56:19 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.1.2
---- Files affected: packages/phpstorm: phpstorm.spec (1.8 -> 1.9) , pld.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/phpstorm/phpstorm.spec diff -u packages/phpstorm/phpstorm.spec:1.8 packages/phpstorm/phpstorm.spec:1.9 --- packages/phpstorm/phpstorm.spec:1.8 Wed Jun 1 11:04:28 2011 +++ packages/phpstorm/phpstorm.spec Tue Jul 26 13:56:14 2011 @@ -1,12 +1,12 @@ # $Revision$, $Date$ Summary: Lightweight and Smart PHP IDE Name: phpstorm -Version: 2.1 +Version: 2.1.2 Release: 1 License: ? Group: Development/Tools Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz -# NoSource0-md5: 372d8dd9669cc04dc663d582ad6c580f +# NoSource0-md5: 11cf69ef4304fc4bd548c9a52ef12549 NoSource: 0 Source1: %{name}.desktop Patch0: pld.patch @@ -38,7 +38,7 @@ Editor, JavaScript Editor) and adds full-fledged support for PHP. %prep -%setup -qn PhpStorm-107.120 +%setup -qn PhpStorm-107.425 %ifarch %{ix86} rm bin/fsnotifier64 rm bin/libbreakgen64.so @@ -100,6 +100,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2011/07/26 11:56:14 glen +- up to 2.1.2 + Revision 1.8 2011/06/01 09:04:28 glen - up to 2.1 ================================================================ Index: packages/phpstorm/pld.patch diff -u packages/phpstorm/pld.patch:1.3 packages/phpstorm/pld.patch:1.4 --- packages/phpstorm/pld.patch:1.3 Wed Jun 1 11:04:28 2011 +++ packages/phpstorm/pld.patch Tue Jul 26 13:56:14 2011 @@ -1,5 +1,5 @@ ---- PhpStorm-107.120/bin/PhpStorm.sh~ 2011-05-19 06:21:07.000000000 +0300 -+++ PhpStorm-107.120/bin/PhpStorm.sh 2011-06-01 11:53:18.701430989 +0300 +--- PhpStorm-107.425/bin/PhpStorm.sh~ 2011-07-19 06:29:11.000000000 +0300 ++++ PhpStorm-107.425/bin/PhpStorm.sh 2011-07-26 14:38:29.476956520 +0300 @@ -27,19 +27,14 @@ if [ -z "$WEBIDE_JDK" ]; then echo ERROR: cannot start WebIde. @@ -21,7 +21,7 @@ rm $VERSION_LOG if [ $OPEN_JDK -eq 0 ]; then echo WARNING: You are launching IDE using OpenJDK Java runtime -@@ -48,15 +43,8 @@ +@@ -48,14 +43,6 @@ echo echo NOTE: If you have both Sun JDK and OpenJDK installed echo please validate either WEBIDE_JDK or JDK_HOME environment variable points to valid Sun JDK installation @@ -34,22 +34,19 @@ -else - BITS="" fi -+BITS="" #-------------------------------------------------------------------------- - # Ensure the WEBIDE_HOME var for this script points to the -@@ -88,12 +76,13 @@ +@@ -88,12 +75,13 @@ # PROFILE - if [ "utils$_run_closure5@1898c18" = "true" ]; then + if [ "utils$_run_closure5@ffc364" = "true" ]; then - AGENT="-agentlib:yjpagent$BITS=disablej2ee,sessionname=webide" + AGENT="-agentlib:yjpagent=disablej2ee,sessionname=webide" fi REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true $AGENT $WEBIDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS" --JVM_ARGS=`tr '\n' ' ' < "$WEBIDE_VM_OPTIONS"` + JVM_ARGS=`tr '\n' ' ' < "$WEBIDE_VM_OPTIONS"` -JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS" -+JVM_ARGS=$(tr '\n' ' ' < "$WEBIDE_VM_OPTIONS") +WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde10" +JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS -Dwebide.config.home=$WEBIDE_CONFIG_HOME" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/pld.patch?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
