jedit: update from 5.1.0 to 5.2.0

2 files changed, 30 insertions, 25 deletions

diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch
index 2dabaaaed0c9..2f630f18ab76 100644
--- a/pkgs/applications/editors/jedit/build.xml.patch
+++ b/pkgs/applications/editors/jedit/build.xml.patch
@@ -1,6 +1,6 @@
---- a/build.xml	2013-07-28 18:03:55.000000000 +0100
-+++ b/build.xml	2014-11-12 21:54:48.443482074 +0000
-@@ -42,16 +42,6 @@
+--- a/build.xml	2015-02-04 08:47:37.000000000 +0100
++++ b/build.xml	2015-02-17 14:06:42.455283148 +0100
+@@ -43,16 +43,6 @@
  	<property name="textAreaPackage"
  		  location="../textarea"/>
  
@@ -17,7 +17,7 @@
  	<!-- Miscellaneous -->
  	<property name="jar.filename"
  		  value="${ant.project.name}.jar"/>
-@@ -89,51 +79,8 @@
+@@ -90,51 +80,8 @@
  			  value="true"/>
  	</target>
  
@@ -39,7 +39,7 @@
 -
 -	<target name="init-ivy"
 -		depends="init,download-ivy"
--		unless="${ivy.done}">
+-		unless="ivy.done">
 -		<property name="ivy.retrieve.pattern"
 -			  value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
 -		<taskdef resource="org/apache/ivy/ant/antlib.xml"
@@ -52,7 +52,7 @@
 -	<target name="retrieve"
 -		description="retrieve the dependencies"
 -		depends="init,init-ivy"
--		unless="${ivy.done}">
+-		unless="ivy.done">
 -		<ivy:retrieve sync="true"/>
 -		<ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
 -			      organisation="org.apache.ivy"
@@ -70,7 +70,7 @@
  		<taskdef resource="net/sf/antcontrib/antlib.xml"
  			 uri="antlib:net.sf.antcontrib">
  			<classpath>
-@@ -238,37 +185,6 @@
+@@ -239,37 +186,6 @@
  		</javac>
  	</target>
  
@@ -108,13 +108,14 @@
  	<target name="prepare-textArea"
  		depends="init">
  		<delete includeemptydirs="true"
-@@ -425,32 +341,8 @@
+@@ -423,33 +339,8 @@
  		</javac>
  	</target>
  
 -	<target name="test"
 -		depends="init,retrieve,compile,compile-test"
--		description="run unit tests">
+-		description="run unit tests"
+-		unless="skip.tests">
 -		<delete dir="${build.dir}/test/raw-reports"/>
 -		<mkdir dir="${build.dir}/test/raw-reports"/>
 -		<junit printsummary="true"
@@ -142,7 +143,11 @@
  		description="build the jEdit JAR-file with full debug-information">
  		<mkdir dir="${jar.location}"/>
  		<jar destfile="${jar.location}/${jar.filename}"
-@@ -508,7 +400,7 @@
+@@ -504,11 +395,10 @@
+ 				</copy>
+ 			</contrib:then>
+ 		</contrib:if>
+-		<antcall target="test" />
  	</target>
  
  	<target name="build-exe-launcher"
@@ -151,7 +156,7 @@
  		description="build the EXE launcher">
  		<contrib:if>
  			<os family="windows"/>
-@@ -611,7 +503,7 @@
+@@ -622,7 +512,7 @@
  	</target>
  
  	<target name="unpack-docbook-xsl"
@@ -160,7 +165,7 @@
  		<unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"
  		       dest="${build.dir}/docbook-xsl/"/>
  	</target>
-@@ -655,7 +547,7 @@
+@@ -668,7 +558,7 @@
  	</presetdef>
  
  	<target name="generate-doc-faq"
@@ -169,7 +174,7 @@
  		<dependset.html>
  			<srcfileset dir="doc/FAQ"/>
  			<targetfileset dir="${jar.location}/doc/FAQ"/>
-@@ -679,7 +571,7 @@
+@@ -692,7 +582,7 @@
  	</target>
  
  	<target name="generate-doc-news"
@@ -178,7 +183,7 @@
  		<dependset.html>
  			<srcfileset dir="doc/whatsnew"/>
  			<targetfileset dir="${jar.location}/doc/whatsnew"/>
-@@ -703,7 +595,7 @@
+@@ -716,7 +606,7 @@
  	</target>
  
  	<target name="generate-doc-users-guide"
@@ -187,7 +192,7 @@
  		<dependset.html>
  			<srcfileset dir="doc/users-guide"/>
  			<targetfileset dir="${jar.location}/doc/users-guide"/>
-@@ -838,7 +730,7 @@
+@@ -851,7 +741,7 @@
  	</target>
  
  	<target name="generate-pdf-users-guide"
@@ -196,7 +201,7 @@
  		<fail message="Please set the property &quot;paper.type&quot;"
  		      unless="paper.type"/>
  		<contrib:switch value="${paper.type}">
-@@ -1143,7 +1035,7 @@
+@@ -1154,7 +1044,7 @@
  	</target>
  
  	<target name="compile-jarbundler"
@@ -205,7 +210,7 @@
  		<mkdir dir="${classes.dir}/jarbundler"/>
  		<depend srcDir="${basedir}"
  			destDir="${classes.dir}/jarbundler"
-@@ -1173,7 +1065,7 @@
+@@ -1180,7 +1070,7 @@
  	</target>
  
  	<target name="dist-mac-finish"
@@ -214,7 +219,7 @@
  		description="finish building the Mac OS X disk image (DMG-file) on Mac OS X">
  		<fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently">
  			<condition>
-@@ -1271,7 +1163,7 @@
+@@ -1295,7 +1185,7 @@
  	</target>
  
  	<target name="dist-mac"
@@ -223,7 +228,7 @@
  		description="build the Mac OS X disk image (DMG-file)">
  		<antcall target="compile-jarbundler">
  			<param name="config.build.debuglevel"
-@@ -1386,7 +1278,7 @@
+@@ -1411,7 +1301,7 @@
  	</target>
  
  	<target name="prepare-dist-files"
@@ -232,7 +237,7 @@
  		<antcall target="build">
  			<param name="config.build.debuglevel"
  			       value="lines,source"/>
-@@ -1567,7 +1459,7 @@
+@@ -1592,7 +1482,7 @@
  	</target>
  
  	<target name="dist-deb"
@@ -241,7 +246,7 @@
  		description="build the DEB Package">
  		<antcall target="compile-ar">
  			<param name="config.build.debuglevel"
-@@ -1813,7 +1705,7 @@
+@@ -1838,7 +1728,7 @@
  	</target>
  
  	<target name="dist-sign-deb-Release"
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index b19723177046..7dfb651d7d30 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}:
+{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }:
 
 let
-  version = "5.1.0";
+  version = "5.2.0";
   bsh = fetchurl {
     url = http://www.beanshell.org/bsh-2.0b4.jar;
     sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   name = "jedit-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
-    sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6";
+    sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x";
   };
 
   buildInputs = [ ant jdk commonsBsf commonsLogging ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     description = "Mature programmer's text editor (Java based)";
     homepage = http://www.jedit.org;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.vbgl ];
   };
 }