Updated and standardized PKGBUILD + minor

changes

1 files changed, 25 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a2d200975a61..e1df327a2cc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Raphael Emberger(raember) <raphael.emberger@hotmail.ch>
 # Contributor: Hervé Bitteur <herve.bitteur@audiveris.com>
-# Contributor: Beat Jäckle <bjaeckle@student.ethz.ch>
-pkgname=audiveris
+# Contributor: Beat Jäckle <beat@git.jdmweb2.ch>
+
+_pkgname=audiveris
+pkgname="$_pkgname"
 pkgver=5.3.1
-_gitcommit=f0bdbe6
 _tag=5.3.1
-pkgrel=2
+_gitcommit=f0bdbe6
+_name="${_pkgname}-${pkgver/_/-}"
+pkgrel=3
 pkgdesc="Music score OMR engine"
 arch=('any')
-url="https://github.com/Audiveris/audiveris"
+url="https://github.com/Audiveris/$_pkgname"
 license=('AGPL3')
 depends=(
   'java-runtime>=17'
@@ -20,11 +23,14 @@ makedepends=(
   'java-environment>=17'
   'gradle'
 )
-optdepends=('tesseract-data: For languages other than english')
+optdepends=(
+  'tesseract-data: For languages other than english'
+  'audiveris-doc: Documentation for Audiveris'
+)
 source=(
-  "$pkgname-${pkgver/_/-}.tar.gz::https://github.com/Audiveris/$pkgname/archive/${pkgver/_/-}.tar.gz"
-  "$pkgname"
-  "$pkgname.desktop"
+  "${_name}.tar.gz::${url}/archive/${pkgver/_/-}.tar.gz"
+  "$_pkgname"
+  "$_pkgname.desktop"
 )
 sha256sums=(
   'b81ef95ea87cfb73ff718ff3a33acddc4a275f94d1d25134bdc43b813d28d6d6'
@@ -34,29 +40,28 @@ sha256sums=(
 
 prepare() {
   # Replacing git commit request with static commit hash
-  sed -i "s/git rev-parse --short HEAD/echo '${_gitcommit}'/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
+  sed -i "s/git rev-parse --short HEAD/echo '${_gitcommit}'/g" "$srcdir/$_name/build.gradle"
 }
 
 build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  cd "$srcdir/${_name}"
   # Failing tests are not our concern. Ignore them.
   sed 's/src\/test/src\/main/' -i build.gradle
-  gradle build jar --stacktrace
+  gradle build jar
 }
 
 package() {
   # Extracting libraries
-  install -dm755 "$pkgdir/usr/share/java/$pkgname"
-  bsdtar -C "$pkgdir/usr/share/java/$pkgname" --strip-components=2 \
-    -xf "$srcdir/$pkgname-${pkgver/_/-}/build/distributions/Audiveris-${_tag}.tar" \
+  install -dm755 "$pkgdir/usr/share/java/$_pkgname"
+  bsdtar -C "$pkgdir/usr/share/java/$_pkgname" --strip-components=2 \
+    -xf "$srcdir/$_name/build/distributions/Audiveris-${_tag}.tar" \
     Audiveris-${_tag}/lib/*
   
   # Creating starter script
-  install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 "$srcdir/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
 
   # Install desktopfile
-  install -Dm755 "$srcdir/$pkgname-${pkgver/_/-}/res/icon-256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
-  install -Dm755 "$srcdir/$pkgname-${pkgver/_/-}/res/icon-64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/$pkgname.png"
-  install -Dm755 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm755 "$srcdir/$_name/res/icon-256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
+  install -Dm755 "$srcdir/$_name/res/icon-64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/$pkgname.png"
+  install -Dm755 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop"
 }
-