Author: glen Date: Tue Sep 6 10:28:30 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.1.3
---- Files affected: packages/phpstorm: phpstorm.spec (1.9 -> 1.10) , pld.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/phpstorm/phpstorm.spec diff -u packages/phpstorm/phpstorm.spec:1.9 packages/phpstorm/phpstorm.spec:1.10 --- packages/phpstorm/phpstorm.spec:1.9 Tue Jul 26 13:56:14 2011 +++ packages/phpstorm/phpstorm.spec Tue Sep 6 12:28:25 2011 @@ -1,12 +1,12 @@ # $Revision$, $Date$ Summary: Lightweight and Smart PHP IDE Name: phpstorm -Version: 2.1.2 +Version: 2.1.3 Release: 1 License: ? Group: Development/Tools Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz -# NoSource0-md5: 11cf69ef4304fc4bd548c9a52ef12549 +# NoSource0-md5: af5071de0fd65ab0e66d934bd42953cf 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.425 +%setup -qn PhpStorm-107.581 %ifarch %{ix86} rm bin/fsnotifier64 rm bin/libbreakgen64.so @@ -53,6 +53,9 @@ chmod a+rx bin/*.so bin/fsnotifier mv bin/webide.png . +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f + %build # replace with system jars ln -snf %{_javadir}/commons-codec-1.3.jar lib @@ -100,6 +103,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2011/09/06 10:28:25 glen +- up to 2.1.3 + Revision 1.9 2011/07/26 11:56:14 glen - up to 2.1.2 ================================================================ Index: packages/phpstorm/pld.patch diff -u packages/phpstorm/pld.patch:1.4 packages/phpstorm/pld.patch:1.5 --- packages/phpstorm/pld.patch:1.4 Tue Jul 26 13:56:14 2011 +++ packages/phpstorm/pld.patch Tue Sep 6 12:28:25 2011 @@ -1,5 +1,5 @@ ---- 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 +--- PhpStorm-107.581/bin/PhpStorm.sh~ 2011-09-01 18:24:43.000000000 +0300 ++++ PhpStorm-107.581/bin/PhpStorm.sh 2011-09-01 18:25:32.747999292 +0300 @@ -27,19 +27,14 @@ if [ -z "$WEBIDE_JDK" ]; then echo ERROR: cannot start WebIde. @@ -36,23 +36,15 @@ fi #-------------------------------------------------------------------------- -@@ -88,12 +75,13 @@ - - # PROFILE - if [ "utils$_run_closure5@ffc364" = "true" ]; then -- AGENT="-agentlib:yjpagent$BITS=disablej2ee,sessionname=webide" -+ AGENT="-agentlib:yjpagent=disablej2ee,sessionname=webide" - fi - +@@ -81,6 +81,8 @@ 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="$JVM_ARGS $REQUIRED_JVM_ARGS" + JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS" +WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde10" +JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS -Dwebide.config.home=$WEBIDE_CONFIG_HOME" CLASSPATH=../lib/bootstrap.jar CLASSPATH=$CLASSPATH:../lib/util.jar - --- PhpStorm-103.99/bin/idea.properties~ 2011-02-14 11:44:54.000000000 +0200 +++ PhpStorm-103.99/bin/idea.properties 2011-03-11 07:48:34.638262763 +0200 @@ -10,13 +10,13 @@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.9&r2=1.10&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/pld.patch?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
