Updated to 5.2.5

3 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 311ab93ef8b4..d6941c6534a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = audiveris
 	pkgdesc = Music score OMR engine
-	pkgver = 5.2.4
-	pkgrel = 3
+	pkgver = 5.2.5
+	pkgrel = 1
 	url = https://github.com/Audiveris/audiveris
 	arch = x86_64
 	license = AGPL3
-	makedepends = java-environment=11
+	makedepends = java-environment>=17
 	makedepends = gradle
-	depends = java-runtime=11
+	depends = java-runtime>=17
 	depends = archlinux-java-run>=7
 	depends = tesseract-data-eng
 	depends = freetype2
 	optdepends = tesseract-data: For languages other than english
-	source = audiveris-5.2.4.tar.gz::https://github.com/Audiveris/audiveris/archive/5.2.4.tar.gz
+	source = audiveris-5.2.5.tar.gz::https://github.com/Audiveris/audiveris/archive/5.2.5.tar.gz
 	source = audiveris
-	sha256sums = ab7f686484c87640dfa67777b4392bf3aa1809d08f6ea2370d6fcc6ea3298aff
-	sha256sums = 12223d402f4f6719051df7ab4776a82c7326c41f49403d4d1868c5b041678743
+	sha256sums = 4c9969b24208e5b2862e78f354eb05136af0ad9369b4b23129d3efa7be1883ff
+	sha256sums = f8c61a27680a5255940d6837601dc461b517110e13aa9673c88f4c0300bfa255
 
 pkgname = audiveris
diff --git a/PKGBUILD b/PKGBUILD
index de632f26121e..f6cfb53bc19e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: Raphael Emberger(raember) <raphael.emberger@hotmail.ch>
 # Contributor: Hervé Bitteur <herve.bitteur@audiveris.com>
 pkgname=audiveris
-pkgver=5.2.4
+pkgver=5.2.5
 _gitcommit=3353f40
-pkgrel=3
+_tag=5.3-alpha
+pkgrel=1
 pkgdesc="Music score OMR engine"
 arch=('x86_64')
 url="https://github.com/Audiveris/audiveris"
 license=('AGPL3')
 depends=(
-  'java-runtime=11'
+  'java-runtime>=17'
   'archlinux-java-run>=7'
   'tesseract-data-eng'
   'freetype2'
 )
 makedepends=(
-  'java-environment=11'
+  'java-environment>=17'
   'gradle'
 )
 optdepends=('tesseract-data: For languages other than english')
@@ -23,39 +24,31 @@ source=(
   "$pkgname-${pkgver/_/-}.tar.gz::https://github.com/Audiveris/$pkgname/archive/${pkgver/_/-}.tar.gz"
   "$pkgname"
 )
-sha256sums=('ab7f686484c87640dfa67777b4392bf3aa1809d08f6ea2370d6fcc6ea3298aff'
-            '12223d402f4f6719051df7ab4776a82c7326c41f49403d4d1868c5b041678743')
+sha256sums=('4c9969b24208e5b2862e78f354eb05136af0ad9369b4b23129d3efa7be1883ff'
+            'f8c61a27680a5255940d6837601dc461b517110e13aa9673c88f4c0300bfa255')
 
 prepare() {
-  msg2 'Replacing git commit request with static commit hash'
+  # Replacing git commit request with static commit hash
   sed -i "s/git rev-parse --short HEAD/echo '${_gitcommit}'/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
-
-  msg2 'Updating gradle build config for newest gradle version'
-  sed -i "s/compile(/implementation(/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
-  sed -i "s/runtime(/runtimeOnly(/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
-  sed -i "s/testCompile(/testImplementation(/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
-  
-  msg2 'Quickfix for javadoc'
-  sed -i "s/XmlJavaTypeAdapter;/XmlJavaTypeAdapter;\nimport org.audiveris.omr.sig.relation.Containment;/g" "$srcdir/$pkgname-${pkgver/_/-}/src/main/org/audiveris/omr/sig/inter/SentenceInter.java"
 }
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
-  export JAVA_HOME=$(archlinux-java-run -a 11 -b 11 -f jdk -j)
+  export JAVA_HOME=$(archlinux-java-run -a 17 -b 18 -f jdk -j)
   gradle build javadoc
 }
 
 package() {
-  msg2 'Extracting libraries'
+  # 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.tar" \
-    Audiveris/lib/*
+    -xf "$srcdir/$pkgname-${pkgver/_/-}/build/distributions/Audiveris-${_tag}.tar" \
+    Audiveris-${_tag}/lib/*
   
-  msg2 'Creating starter script'
+  # Creating starter script
   install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-  msg2 'Installing JavaDoc'
+  # Installing JavaDoc
   install -dm755 "$pkgdir/usr/share/doc"
   cp -r "$srcdir/$pkgname-${pkgver/_/-}/build/docs/javadoc" "$pkgdir/usr/share/doc/$pkgname"
 }
diff --git a/audiveris b/audiveris
index 6a47bbc45b66..b29e2772328a 100755
--- a/audiveris
+++ b/audiveris
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /usr/bin/java -cp "/usr/share/java/audiveris/*" Audiveris "$@"
+exec /usr/bin/archlinux-java-run -a 17 -b 18 -- -cp "/usr/share/java/audiveris/*" Audiveris "$@"