Date: Tuesday, June 28, 2016 @ 16:58:50 Author: arodseth Revision: 181517
Using the jEdit slackware package as basis instead of the jar installer Modified: jedit/trunk/PKGBUILD jedit/trunk/jedit.sh ----------+ PKGBUILD | 45 ++++++++++----------------------------------- jedit.sh | 12 +++++++----- 2 files changed, 17 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-06-28 16:46:53 UTC (rev 181516) +++ PKGBUILD 2016-06-28 16:58:50 UTC (rev 181517) @@ -5,60 +5,39 @@ # Contributor: Jeff Mickey <[email protected]> # Contributor: Dusty Phillips <[email protected]> -# TODO Fix problems when building in a chroot - pkgname=jedit pkgver=5.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='Text editor for programmers' arch=('any') -url='http://www.jedit.org/' +url='http://jedit.org/' license=('GPL') depends=('java-runtime') -makedepends=('apache-ant' 'gendesk' 'unzip' 'tar' 'maven' 'java-environment' 'apache-ivy') +makedepends=('apache-ant' 'gendesk' 'unzip' 'maven' 'java-environment' 'apache-ivy') optdepends=('java-environment: for java development' - 'noto-fonts: usable font') + 'noto-fonts: a usable font') options=('!emptydirs') -noextract=("${pkgname}${pkgver}install.jar") source=('jedit.sh' 'jeditbg.sh' 'jedit.props' - "http://sourceforge.net/projects/jedit/files/jedit/$pkgver/jedit${pkgver}source.tar.bz2";) + "http://sourceforge.net/projects/jedit/files/jedit/$pkgver/jedit-${pkgver}-noarch-1sao.tgz";) sha256sums=('b2e5a8f2f4818b336b5d71f677114f1bc01e929d7fa60918675cc2234dae1a3a' 'a1dd1b688f08c5c967861fe80df13cac201afa6dcfcecc9a289b2c3bec7c8915' 'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347' - '8d56d036be4dd45254748f063ade01293b862a615cdff6aed274ab58085f6304') + '888740e33376781cd991ba7ba6abfa3ac1fe79cd939f5278ae7310f6a2084855') prepare() { gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'jeditbg %U' \ --name 'jEdit' --genericname 'Editor' - - # Extract the documentation so that it can be installed manually - #unzip "${pkgname}${pkgver}install.jar" - #tar jxf installer/jedit-api.tar.bz2 } -build() { - cd jEdit - - ant -k dist-java -} - package() { - install -d "$pkgdir/usr/share/java/$pkgdir" \ - "$pkgdir/usr/bin" \ - "$pkgdir/usr/share/man/man1" + cd "$srcdir" - cd jEdit/dist + install -d "$pkgdir/usr/share/"{doc,java} + cp -r "usr/doc/$pkgname-$pkgver" "$pkgdir/usr/share/doc/$pkgname" + cp -r "usr/share/$pkgname-$pkgver" "$pkgdir/usr/share/java/$pkgname" - # Run the installer - (java -jar "${pkgname}${pkgver}install.jar" auto \ - "$pkgdir/usr/share/java/$pkgname/" \ - unix-script="$pkgdir/usr/bin/" \ - unix-man="$pkgdir/usr/share/man/man1/" 2>&1) > inst.log - - cd "$srcdir" - # Launchers, properties and desktop shortcuts install -Dm755 jedit.sh "$pkgdir/usr/bin/jedit" install -Dm755 jeditbg.sh "$pkgdir/usr/bin/jeditbg" @@ -66,10 +45,6 @@ install -Dm644 jedit.desktop "$pkgdir/usr/share/applications/jedit.desktop" install -Dm644 "$pkgdir/usr/share/java/jedit/doc/jedit.png" \ "$pkgdir/usr/share/pixmaps/jedit.png" - - # The missing documentation files - cd jEdit - cp -ru doc "$pkgdir/usr/share/java/jedit/doc" } # vim:set ts=2 sw=2 et: Modified: jedit.sh =================================================================== --- jedit.sh 2016-06-28 16:46:53 UTC (rev 181516) +++ jedit.sh 2016-06-28 16:58:50 UTC (rev 181517) @@ -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" "$@"
