jedit-5.3.0-4.parabola1: rebuild

5 files changed, 47 insertions, 29 deletions

diff --git a/libre/jedit/PKGBUILD b/libre/jedit/PKGBUILD
index bd6dfab86..f428e6808 100644
--- a/libre/jedit/PKGBUILD
+++ b/libre/jedit/PKGBUILD
@@ -2,35 +2,34 @@
 
 pkgname=jedit
 pkgver=5.3.0
-pkgrel=1.parabola1
-pkgdesc='Text editor for programmers'
+pkgrel=4.parabola1
+pkgdesc='Editor for programmers'
 arch=('any')
-url='http://www.jedit.org/'
+url='http://jedit.org/'
 license=('GPL')
 depends=('java-runtime')
 makedepends=('apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell2'
              'gendesk' 'java-hamcrest' 'jsr305' 'junit')
 optdepends=('java-environment: for java development'
-            'ttf-fira-mono: usable font')
+            'noto-fonts: perfectly usable font')
 options=('!emptydirs')
-install=$pkgname.install
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/jedit${pkgver}source.tar.bz2"
         'jedit.sh'
         'jeditbg.sh'
         'jedit.props'
         'jedit-fix_build.patch')
 sha256sums=('8d56d036be4dd45254748f063ade01293b862a615cdff6aed274ab58085f6304'
-            'b2e5a8f2f4818b336b5d71f677114f1bc01e929d7fa60918675cc2234dae1a3a'
+            'ae53cda453152dd7835d6428910171ca1383bb5e36a4b9b1164d98a940f6ed10'
             'a1dd1b688f08c5c967861fe80df13cac201afa6dcfcecc9a289b2c3bec7c8915'
-            '1a8c6e51810abc9ff56606b61042e2e980cb4b479fa0099b3c93acd7e4b9295b'
-            '6e582bf78458783fcc620d2a850474d2eb787ecf2e3950031ec4bdda48cafeb9')
+            'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347'
+            '68b91f30a486ac954521f98e1ded152308df220f06a8854b3b995c002f54424e')
 
 prepare() {
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'jeditbg %U' \
     --name 'jEdit' --genericname 'Editor'
 
   cd jEdit
-  mkdir -p lib/{ant-contrib,compile,ivy,default-plugins,scripting,test}
+  mkdir -p lib/{ant-contrib,compile,docbook,ivy,default-plugins,scripting,test}
   ln -sf /usr/share/java/ant-contrib.jar lib/ant-contrib/ant-contrib.jar
   ln -sf /usr/share/java/bsh.jar lib/ant-contrib/bsh.jar
   ln -sf /usr/share/java/hamcrest-core.jar lib/test/hamcrest-core.jar
diff --git a/libre/jedit/jedit-fix_build.patch b/libre/jedit/jedit-fix_build.patch
index 367dfdf7c..123bb219d 100644
--- a/libre/jedit/jedit-fix_build.patch
+++ b/libre/jedit/jedit-fix_build.patch
@@ -1,5 +1,5 @@
 --- jEdit.orig/build.xml	2015-10-20 12:56:08.000000000 -0500
-+++ jEdit/build.xml	2016-06-27 03:39:13.537041553 -0500
++++ jEdit/build.xml	2016-07-02 10:14:37.488512109 -0500
 @@ -119,7 +119,7 @@
  
  	<target name="retrieve"
@@ -9,3 +9,32 @@
  		unless="ivy.done">
  		<ivy:retrieve sync="true"/>
  		<ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
+@@ -629,8 +629,6 @@
+ 
+ 	<target name="unpack-docbook-xsl"
+ 		depends="init,retrieve">
+-		<unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"
+-		       dest="${build.dir}/docbook-xsl/"/>
+ 	</target>
+ 
+ 	<presetdef name="dependset.build">
+@@ -645,7 +643,6 @@
+ 
+ 	<presetdef name="dependset.html">
+ 		<dependset.build>
+-			<srcfileset dir="${lib.dir}/docbook"/>
+ 			<srcfilelist files="doc/jedithtml.xsl"/>
+ 		</dependset.build>
+ 	</presetdef>
+@@ -660,9 +657,9 @@
+ 			<factory name="com.icl.saxon.TransformerFactoryImpl"/>
+ 			<xmlcatalog>
+ 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
+-					location="${build.dir}/docbook-xsl/docbook/html/chunk.xsl"/>
++					location="/usr/share/xml/docbook/xsl-stylesheets-1.79.1/html/chunk.xsl"/>
+ 				<entity publicid="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
+-					location="${build.dir}/docbook-xsl/docbook/fo/docbook.xsl"/>
++					location="/usr/share/xml/docbook/xsl-stylesheets-1.79.1/fo/docbook.xsl"/>
+ 			</xmlcatalog>
+ 			<sysproperty key="javax.xml.parsers.DocumentBuilderFactory"
+ 				     value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
diff --git a/libre/jedit/jedit.install b/libre/jedit/jedit.install
deleted file mode 100644
index 7c0a944ef..000000000
--- a/libre/jedit/jedit.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/jedit/jedit.props b/libre/jedit/jedit.props
index 022ffba5e..a712b9686 100644
--- a/libre/jedit/jedit.props
+++ b/libre/jedit/jedit.props
@@ -14,8 +14,9 @@ buffer.maxLineLen=99
 icon-theme=tango
 lookAndFeel=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
 view.fontsize=14
-view.font=Fira Mono
+view.font=Noto Mono
 view.selectionFg=false
+view.antiAlias=standard
 view.caretColor=\#333333
 view.lineHighlightColor=\#deebfb
 view.thickCaret=false
diff --git a/libre/jedit/jedit.sh b/libre/jedit/jedit.sh
index f05359f2d..84f07bdae 100644
--- a/libre/jedit/jedit.sh
+++ b/libre/jedit/jedit.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
+
 # Runs jEdit - Programmer's Text Editor
 
-# If $HOME/.jedit or $HOME/.jedit/properties exists, don't do anything.
-# If not, copy in a default property file.
+# If both $HOME/.jedit and $HOME/.jedit/properties doesn't exist,
+# copy in a default property file.
 if [ ! -e $HOME/.jedit ]; then
   if [ ! -e $HOME/.jedit/properties ]; then
-    mkdir $HOME/.jedit
-		cp /usr/share/jedit/default.props $HOME/.jedit/properties
+    mkdir -p "$HOME/.jedit"
+    cp "/usr/share/jedit/default.prop"s "$HOME/.jedit/properties"
   fi
 fi
 
-# Set jvm heap initial and maximum sizes (in megabytes).
+# Set the initial and maximum JVM heap size
 JAVA_HEAP_MAX_SIZE=192
 
+# Start jEdit
 exec java -Xmx${JAVA_HEAP_MAX_SIZE}M -Dawt.useSystemAAFontSettings=lcd -jar "/usr/share/java/jedit/jedit.jar" "$@"