From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 19 Mar 2014 22:39:17 +0000 (+0200)
Subject: up to 7.1.3
X-Git-Tag: phpstorm-7.1.3-1~5
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1f07e370b27c3b7bc373b6a67e02538821a1f6f4;p=packages%2Fphpstorm.git

up to 7.1.3
---

diff --git a/phpstorm.spec b/phpstorm.spec
index 4ddc168..f7a0465 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:	6.0.3
+Version:	7.1.3
 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:	0cd9e43f535052d52c58e695912b9445
+# NoSource0-md5:	5c68dce5fa53ce2ff42fa8a590561c40
 NoSource:	0
 Source1:	%{name}.desktop
 Patch0:		pld.patch
@@ -29,6 +29,11 @@ Suggests:	git-core
 Suggests:	subversion
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# don't strip fsnotifier, it's size is checked for "outdated binary"
+# https://bugs.archlinux.org/task/34703
+# http://git.jetbrains.org/?p=idea/community.git;a=blob;f=platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java;h=004311b96a35df1ffc2c87baba78a8b2a8809f7d;hb=376b939fd6d6ec4c12191a5f90503d9d62c501da#l173
+%define		_noautostrip	.*/fsnotifier.*
+
 # use /usr/lib, 64bit files do not conflict with 32bit files (64 suffix)
 # this allows to install both arch files and to use 32bit jdk on 64bit os
 %define		_appdir		%{_prefix}/lib/%{name}
@@ -44,7 +49,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-129.814
+%setup -qn PhpStorm-133.982
 
 # 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 6359047..4c496c0 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,42 +1,42 @@
---- PhpStorm-127.100/bin/phpstorm.sh~	2013-03-12 11:19:05.000000000 +0200
-+++ PhpStorm-127.100/bin/phpstorm.sh	2013-03-13 21:09:15.996677961 +0200
-@@ -149,8 +149,11 @@
+--- PhpStorm-133.982/bin/phpstorm.sh~	2014-02-25 05:52:36.000000000 +0200
++++ PhpStorm-133.982/bin/phpstorm.sh	2014-03-19 23:55:40.612633775 +0200
+@@ -145,8 +145,11 @@
    fi
  fi
  
 +WEBIDE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/PhpStorm"
 +WEBIDE_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/PhpStorm"
 +
- COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde60 $IDE_PROPERTIES_PROPERTY"
+ COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde70 $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.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR"
  ALL_JVM_ARGS="$VM_OPTIONS $COMMON_JVM_ARGS $IDE_JVM_ARGS $AGENT $REQUIRED_JVM_ARGS"
  
  CLASSPATH="$IDE_HOME/lib/bootstrap.jar"
---- PhpStorm-121.390/bin/idea.properties~	2012-10-30 15:40:58.000000000 +0200
-+++ PhpStorm-121.390/bin/idea.properties	2012-11-22 12:54:58.000000000 +0200
-@@ -13,21 +13,25 @@
- # Uncomment this option if you want to customize path to IDE config folder. Make sure you're using forward slashes
+--- 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
+@@ -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=${webide.config.dir}
  
  #---------------------------------------------------------------------
- # Uncomment this option if you want to customize path to IDE system folder. Make sure you're using forward slashes
+ # 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=${webide.cache.dir}
  
  #---------------------------------------------------------------------
- # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes
+ # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
- # idea.plugins.path=${user.home}/.WebIde/config/plugins
+ # idea.plugins.path=${idea.config.path}/plugins
 +idea.plugins.path=${webide.config.dir}/plugins
  
  #---------------------------------------------------------------------
  # Uncomment this option if you want to customize path to IDE logs folder. Make sure you're using forward slashes.
  #---------------------------------------------------------------------
- # idea.log.path=${user.home}/.WebIde/system/log
+ # idea.log.path=${idea.system.path}/log
 +idea.log.path=${webide.cache.dir}/log
  
  #---------------------------------------------------------------------