diff options
| -rw-r--r-- | libre/jedit/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre/jedit/jedit-fix_build.patch | 8 |
2 files changed, 11 insertions, 23 deletions
diff --git a/libre/jedit/PKGBUILD b/libre/jedit/PKGBUILD index f428e6808..588258a00 100644 --- a/libre/jedit/PKGBUILD +++ b/libre/jedit/PKGBUILD @@ -2,14 +2,14 @@ pkgname=jedit pkgver=5.3.0 -pkgrel=4.parabola1 +pkgrel=4.parabola2 pkgdesc='Editor for programmers' arch=('any') url='http://jedit.org/' license=('GPL') depends=('java-runtime') -makedepends=('apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell2' - 'gendesk' 'java-hamcrest' 'jsr305' 'junit') +makedepends=('apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell2' 'docbook-xsl-saxon' + 'gendesk' 'java-hamcrest' 'jsr305' 'junit' 'xerces2-java') optdepends=('java-environment: for java development' 'noto-fonts: perfectly usable font') options=('!emptydirs') @@ -22,7 +22,7 @@ sha256sums=('8d56d036be4dd45254748f063ade01293b862a615cdff6aed274ab58085f6304' 'ae53cda453152dd7835d6428910171ca1383bb5e36a4b9b1164d98a940f6ed10' 'a1dd1b688f08c5c967861fe80df13cac201afa6dcfcecc9a289b2c3bec7c8915' 'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347' - '68b91f30a486ac954521f98e1ded152308df220f06a8854b3b995c002f54424e') + '2676e043f9cd7e9e51322f5173ddf05f4ff2b68dc97d984b0b678c80478d4cee') prepare() { gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'jeditbg %U' \ @@ -31,7 +31,11 @@ prepare() { cd jEdit 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/apache-ivy/ivy.jar lib/ivy/ivy.jar ln -sf /usr/share/java/bsh.jar lib/ant-contrib/bsh.jar + ln -sf /usr/share/java/docbook-xsl-saxon.jar lib/docbook/docbook-xsl-saxon.jar + ln -sf /usr/share/java/saxon.jar lib/docbook/saxon.jar + ln -sf /usr/share/java/xercesImpl.jar lib/docbook/xercesImpl.jar ln -sf /usr/share/java/hamcrest-core.jar lib/test/hamcrest-core.jar ln -sf /usr/share/java/hamcrest-library.jar lib/test/hamcrest-library.jar ln -sf /usr/share/java/jsr305.jar lib/compile/jsr305.jar @@ -41,24 +45,16 @@ prepare() { build() { cd jEdit - ant build \ - -lib /usr/share/java/apache-ivy/ivy.jar \ + ant build docs-html \ -Divy.done=true } package() { cd jEdit - # Install license file - install -Dm644 doc/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt" - install -Dm644 doc/COPYING.PLUGINS.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.PLUGINS.txt" - install -Dm644 doc/COPYING.DOC.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.DOC.txt" - # Install documentation - install -m755 -d "$pkgdir/usr/share/java/$pkgname" - cp -ru doc "$pkgdir/usr/share/java/$pkgname/doc" -# install -d "$pkgdir/usr/share/doc/$pkgname" -# cp -r build/javadoc "${pkgdir}/usr/share/doc/${pkgname}" + install -d "$pkgdir/usr/share/java/$pkgname" + cp -r build/doc "$pkgdir/usr/share/java/$pkgname" # Install jars install -D -m644 build/$pkgname.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" diff --git a/libre/jedit/jedit-fix_build.patch b/libre/jedit/jedit-fix_build.patch index 123bb219d..90e9a2231 100644 --- a/libre/jedit/jedit-fix_build.patch +++ b/libre/jedit/jedit-fix_build.patch @@ -18,14 +18,6 @@ </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> |