[packages/phpstorm] up to 2016.3

glen glen at pld-linux.org
Sat Nov 26 01:04:20 CET 2016


commit da262f078ad2a1d1fc10fe4473a39302ef1cf5b7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Nov 25 15:29:07 2016 +0200

    up to 2016.3

 phpstorm.spec | 17 ++++++++---------
 pld.patch     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/phpstorm.spec b/phpstorm.spec
index 7e1e96a..9bc7fb4 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:	2016.2.2
+Version:	2016.3
 Release:	1
 # TODO: figure out what's the licensing and redistribution
 License:	?
 Group:		Development/Tools
 Source0:	https://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5:	6305fdc932dc854d04c34f67dee59529
+# NoSource0-md5:	f80ace50c1e21e99f87b96589a7f6be9
 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-162.2380.11
+%setup -qn PhpStorm-163.7743.50
 
 # keep only single arch files (don't want to pull 32bit deps by default),
 # if you want to mix, install rpm from both arch
@@ -62,11 +62,10 @@ rm bin/libyjpagent-linux.so
 rm bin/phpstorm.vmoptions
 rm -r lib/libpty/linux/x86
 %endif
-rm -r lib/libpty/{macosx,win}
 rm bin/fsnotifier-arm
 %patch0 -p1
 chmod a+rx bin/*.so bin/fsnotifier* lib/libpty/linux/*/libpty.so
-mv bin/webide.png .
+mv bin/phpstorm.png .
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -77,7 +76,7 @@ install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_pixmapsdir},%{_desktopdir}}
 cp -l build.txt $RPM_BUILD_ROOT/cp-test && l=l && rm -f $RPM_BUILD_ROOT/cp-test
 cp -a$l bin help lib plugins $RPM_BUILD_ROOT%{_appdir}
 ln -s %{_pixmapsdir}/%{name}.png $RPM_BUILD_ROOT%{_appdir}/bin
-cp -p webide.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p phpstorm.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pstorm
 ln -s pstorm $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -98,13 +97,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/bin/idea.properties
 %{_appdir}/bin/log.xml
 %attr(755,root,root) %{_appdir}/bin/%{name}.sh
-%attr(755,root,root) %{_appdir}/bin/inspect.sh
+%attr(755,root,root) %{_appdir}/bin/*.py
+%attr(755,root,root) %{_appdir}/bin/format.sh
 %attr(755,root,root) %{_appdir}/bin/fsnotifier*
+%attr(755,root,root) %{_appdir}/bin/inspect.sh
 %attr(755,root,root) %{_appdir}/bin/libyjpagent-linux*.so
 %dir %{_appdir}/lib
 %{_appdir}/lib/*.jar
-%dir %{_appdir}/lib/ext
-%{_appdir}/lib/ext/*.jar
 %dir %{_appdir}/lib/libpty
 %dir %{_appdir}/lib/libpty/linux
 %dir %{_appdir}/lib/libpty/linux/x86*
diff --git a/pld.patch b/pld.patch
index 7cca487..058d6e6 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- PhpStorm-145.258.2/bin/phpstorm.sh	2016-03-21 11:05:59.385371297 +0200
-+++ PhpStorm-145.258.2/bin/phpstorm.sh	2016-03-21 11:05:59.385371297 +0200
+--- PhpStorm-163.7743.50/bin/phpstorm.sh~	2016-11-24 19:42:09.000000000 +0200
++++ PhpStorm-163.7743.50/bin/phpstorm.sh	2016-11-24 20:01:18.624544058 +0200
 @@ -178,6 +178,9 @@
    CLASSPATH="$CLASSPATH:$WEBIDE_CLASSPATH"
  fi
@@ -10,14 +10,14 @@
  # ---------------------------------------------------------------------
  # Run the IDE.
  # ---------------------------------------------------------------------
-@@ -187,6 +190,7 @@
-   "-Xbootclasspath/a:$IDE_HOME/lib/boot.jar" \
-   -classpath "$CLASSPATH" \
-   $VM_OPTIONS \
-+  -Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR \
+@@ -198,6 +198,7 @@
+   "-XX:HeapDumpPath=$HOME/java_error_in_PHPSTORM.hprof" \
+   -Didea.paths.selector=PhpStorm2016.3 \
    "-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \
-   "-XX:ErrorFile=$HOME/java_error_in_WEBIDE_%p.log" \
-   "-XX:HeapDumpPath=$HOME/java_error_in_WEBIDE.hprof" \
++  -Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR \
+   ${IDE_PROPERTIES_PROPERTY} \
+   -Didea.platform.prefix=PhpStorm -Didea.jre.check=true \
+   com.intellij.idea.Main \
 --- 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 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpstorm.git/commitdiff/da262f078ad2a1d1fc10fe4473a39302ef1cf5b7



More information about the pld-cvs-commit mailing list