[arch-commits] Commit in ditaa/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, July 18, 2018 @ 14:20:53
  Author: arodseth
Revision: 361993

Need to build with leiningen

Modified:
  ditaa/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-18 14:18:08 UTC (rev 361992)
+++ PKGBUILD	2018-07-18 14:20:53 UTC (rev 361993)
@@ -1,42 +1,47 @@
 # $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: Florian Pritz <bluewind at xinu.at>
 # Contributor: domanov <domanov at gmail.com>
 
 pkgname=ditaa
-pkgver=0.10
+pkgver=0.11.0
 pkgrel=1
-pkgdesc='Java utility to convert diagrams drawn using ascii art to bitmap'
+pkgdesc='Utility for converting ASCII art diagrams into bitmaps'
 arch=('any')
 url='https://github.com/stathissideris/ditaa'
 license=('GPL')
-depends=('java-environment' 'gsfonts')
-makedepends=('git' 'apache-ant')
-source=("git://github.com/stathissideris/ditaa#tag=v$pkgver"
-        "$pkgname.sh")
+depends=('gsfonts' 'java-environment>=8')
+makedepends=('apache-ant' 'git')
+source=("git+https://github.com/stathissideris/ditaa#tag=v$pkgver"
+        $pkgname.sh)
 sha256sums=('SKIP'
             '77f95a7c3235a1263b560844f988445083895550385bff1a4c28313b0767e38f')
 
 prepare() {
-  cd "$pkgname"
-
-  sed -i 's/0_9/0_10/g' build/release.xml
-  sed -i 's/version 0.9/version 0.10/g' \
-    src/org/stathissideris/ascii2image/core/CommandLineConverter.java
-  sed -i "s:VERSION:${pkgver/./_}:" "$srcdir/$pkgname.sh"
-  mkdir -p bin
+  local oldver="0_9"
+  local shortver=${pkgver%.0}
+  local underver=${shortver/./_}
+  sed -i "s|$oldver|$underver|" $pkgname/build/release.xml
+  sed -i 's|1.6|1.8|g' $pkgname/build/release.xml
+  sed -i "s|VERSION|$underver|" $pkgname.sh
+  mkdir -p $pkgname/{bin,lib}
+  sed -i 's|</javac>|<compilerarg value="-Xlint:unchecked"/></javac>|g' $pkgname/build/release.xml
 }
 
 build() {
   cd "$pkgname"
 
+  # TODO: Build with leiningen, after moving from AUR to [community]
+
   ant -buildfile build/release.xml release-jar
 }
 
 package() {
-  install -Dm755 "$pkgname/releases/$pkgname${pkgver/./_}.jar" \
-    "$pkgdir/usr/share/java/$pkgname/ditaa-${pkgver/./_}.jar"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  local shortver=${pkgver%.0}
+  local underver=${shortver/./_}
+  install -Dm755 "$pkgname/releases/$pkgname$shortver.jar" \
+    "$pkgdir/usr/share/java/$pkgname/ditaa-$shortver.jar"
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: